code refactoring, dependencies update

* file archive refactor, list dir perf optimization

* code refactoring

.github/workflows/docker-image.yml

@@ -1,17 +1,16 @@
-name: Docker Image CI
+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
@@ -20,7 +19,10 @@ jobs:
         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 build . --file Dockerfile --tag ${{secrets.DOCKER_HUB_USERNAME}}/yt-dlp-webui:latest
+      run: docker buildx build . --file Dockerfile --tag ${{secrets.DOCKER_HUB_USERNAME}}/yt-dlp-webui:latest --push --platform linux/amd64,linux/arm/v7,linux/arm64
-    - name: Publish the Docker image
+
-      run: docker push ${{secrets.DOCKER_HUB_USERNAME}}/yt-dlp-webui:latest

.github/workflows/docker-publish.yml

@@ -1,4 +1,4 @@
-name: Docker
+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
@@ -6,14 +6,15 @@ name: Docker
 # documentation.
 
 on:
-#  schedule:
-#    - cron: '39 13 * * *'
   release:
     branches: [ master ]
-    # Publish semver tags as releases.
     tags: [ 'v*.*.*' ]
-#  pull_request:
+  push:
-#    branches: [ master ]
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  schedule:
+    - cron : '0 1 * * 0'
 
 env:
   # Use docker.io for Docker Hub if empty

.gitignore

@@ -15,3 +15,4 @@ downloads
 .DS_Store
 build/
 yt-dlp-webui
+session.dat

Dockerfile

@@ -1,20 +1,31 @@
-FROM alpine:3.17
+FROM golang:1.20-alpine AS build
 # folder structure
-WORKDIR /usr/src/yt-dlp-webui/downloads
-VOLUME /downloads
 WORKDIR /usr/src/yt-dlp-webui
 # install core dependencies
-RUN apk update
+RUN apk update && \
-RUN apk add curl wget psmisc ffmpeg nodejs npm go yt-dlp
+    apk add nodejs npm go
-# copy srcs
+# copia la salsa
 COPY . .
-# install node dependencies
+# build frontend
 WORKDIR /usr/src/yt-dlp-webui/frontend
-RUN npm i
+RUN npm install
 RUN npm run build
-# install go dependencies
+# build backend + incubator
 WORKDIR /usr/src/yt-dlp-webui
-RUN go build -o yt-dlp-webui
+RUN CGO_ENABLED=0 GOOS=linux go build -o yt-dlp-webui
-# expose and run
+
+# but here yes :)
+FROM alpine:edge
+
+WORKDIR /downloads
+VOLUME /downloads
+
+WORKDIR /app
+
+RUN apk update && \
+    apk add psmisc ffmpeg yt-dlp
+
+COPY --from=build /usr/src/yt-dlp-webui/yt-dlp-webui /app
+
 EXPOSE 3033
 CMD [ "./yt-dlp-webui" , "--out", "/downloads" ]

LICENSE.md

@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

Makefile

@@ -1,14 +1,14 @@
 default:
-	go build -o yt-dlp-webui main.go
+	CGO_ENABLED=0 go build -o yt-dlp-webui main.go
 
 all:
 	cd frontend && pnpm build && cd ..
-	go build -o yt-dlp-webui main.go
+	CGO_ENABLED=0 go build -o yt-dlp-webui main.go
 
 multiarch:
-	GOOS=linux GOARCH=arm go build -o yt-dlp-webui_linux-arm *.go
+	CGO_ENABLED=0 GOOS=linux GOARCH=arm go build -o yt-dlp-webui_linux-arm main.go
-	GOOS=linux GOARCH=arm64 go build -o yt-dlp-webui_linux-arm64 *.go
+	CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o yt-dlp-webui_linux-arm64 main.go
-	GOOS=linux GOARCH=amd64 go build -o yt-dlp-webui_linux-amd64 *.go
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o yt-dlp-webui_linux-amd64 main.go
 	mkdir -p build
 	mv yt-dlp-webui* build
 

README.md

@@ -7,10 +7,13 @@ Intended to be used with docker and in standalone mode. 😎👍
 
 Developed to be as lightweight as possible (because my server is basically an intel atom sbc). 
 
-The bottleneck remains yt-dlp startup time (until yt-dlp will provide a rpc interface).
+The bottleneck remains yt-dlp startup time.
 
-**I strongly recomend the ghcr build instead of docker hub one.**
+**Docker images are available on [Docker Hub](https://hub.docker.com/r/marcobaobao/yt-dlp-webui) or [ghcr.io](https://github.com/marcopeocchi/yt-dlp-web-ui/pkgs/container/yt-dlp-web-ui)**.
 
+```sh
+docker pull marcobaobao/yt-dlp-webui:latest
+```
 ```sh
 docker pull ghcr.io/marcopeocchi/yt-dlp-web-ui:latest
 ```
@@ -86,18 +89,20 @@ Future releases will have:
 ```sh
 # recomended for ARM and x86 devices 
 docker pull ghcr.io/marcopeocchi/yt-dlp-web-ui:latest
-docker run -d -p 3033:3033 -v <your dir>:/usr/src/yt-dlp-webui/downloads ghcr.io/marcopeocchi/yt-dlp-web-ui:latest
+# or
+# docker pull marcobaobao/yt-dlp-webui:latest
+docker run -d -p 3033:3033 -v <your dir>:/downloads ghcr.io/marcopeocchi/yt-dlp-web-ui:latest
 
 # or even
 docker pull ghcr.io/marcopeocchi/yt-dlp-web-ui:latest
-docker create --name yt-dlp-webui -p 8082:3033 -v <your dir>:/usr/src/yt-dlp-webui/downloads ghcr.io/marcopeocchi/yt-dlp-web-ui:latest
+docker create --name yt-dlp-webui -p 8082:3033 -v <your dir>:/downloads ghcr.io/marcopeocchi/yt-dlp-web-ui:latest
 ```
 
 Or with docker but building the container manually.
 
 ```sh
 docker build -t yt-dlp-webui .
-docker run -d -p 3033:3033 -v <your dir>:/usr/src/yt-dlp-webui/downloads yt-dlp-webui
+docker run -d -p 3033:3033 -v <your dir>:/downloads yt-dlp-webui
 ```
 
 ## [Prebuilt binaries](https://github.com/marcopeocchi/yt-dlp-web-ui/releases) installation

frontend/package.json

@@ -1,37 +1,36 @@
 {
   "name": "yt-dlp-webui",
-  "version": "1.1.0",
+  "version": "2.0.7",
-  "description": "A terrible webUI for yt-dlp, all-in-one solution.",
+  "description": "Frontend compontent of yt-dlp-webui",
   "scripts": {
     "dev": "vite",
     "build": "vite build"
   },
-  "author": "marcobaobao",
+  "author": "marcopeocchi",
-  "license": "ISC",
+  "license": "MPL-2.0",
   "dependencies": {
-    "@emotion/react": "^11.9.0",
+    "@emotion/react": "^11.11.0",
-    "@emotion/styled": "^11.8.1",
+    "@emotion/styled": "^11.11.0",
-    "@koa/cors": "^3.3.0",
+    "@mui/icons-material": "^5.11.16",
-    "@mui/icons-material": "^5.6.2",
+    "@mui/material": "^5.13.2",
-    "@mui/material": "^5.6.4",
+    "@reduxjs/toolkit": "^1.9.5",
-    "@reduxjs/toolkit": "^1.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-redux": "^8.0.1",
+    "react-redux": "^8.0.5",
-    "react-router-dom": "^6.3.0",
+    "react-router-dom": "^6.11.2",
-    "rxjs": "^7.4.0",
+    "rxjs": "^7.8.1",
-    "uuid": "^8.3.2"
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@modyfi/vite-plugin-yaml": "^1.0.2",
+    "@modyfi/vite-plugin-yaml": "^1.0.4",
-    "@types/node": "^18.11.18",
+    "@types/node": "^20.2.4",
-    "@types/react": "^18.0.21",
+    "@types/react": "^18.2.7",
-    "@types/react-dom": "^18.0.6",
+    "@types/react-dom": "^18.0.10",
     "@types/react-router-dom": "^5.3.3",
-    "@types/uuid": "^8.3.4",
+    "@types/uuid": "^9.0.1",
-    "@vitejs/plugin-react": "^1.3.2",
+    "@vitejs/plugin-react": "^4.0.0",
     "buffer": "^6.0.3",
-    "typescript": "^4.6.4",
+    "typescript": "^5.0.4",
-    "vite": "^2.9.10"
+    "vite": "^4.3.8"
   }
 }

frontend/src/App.tsx

@@ -1,34 +1,39 @@
-import { ThemeProvider } from "@emotion/react";
+import { ThemeProvider } from '@emotion/react'
-import {
+
-  ChevronLeft,
+import ChevronLeft from '@mui/icons-material/ChevronLeft'
-  Dashboard,
+import Dashboard from '@mui/icons-material/Dashboard'
-  // Download,
+import Menu from '@mui/icons-material/Menu'
-  Menu, Settings as SettingsIcon,
+import SettingsIcon from '@mui/icons-material/Settings'
-  SettingsEthernet,
+import SettingsEthernet from '@mui/icons-material/SettingsEthernet'
-  Storage
+import Storage from '@mui/icons-material/Storage'
-} from "@mui/icons-material";
+
-import {
+import { Box, createTheme } from '@mui/material'
-  Box,
+
-  createTheme, CssBaseline,
+import CircularProgress from '@mui/material/CircularProgress'
-  Divider,
+import CssBaseline from '@mui/material/CssBaseline'
-  IconButton, List,
+import Divider from '@mui/material/Divider'
-  ListItemIcon, ListItemText, Toolbar,
+import IconButton from '@mui/material/IconButton'
-  Typography
+import List from '@mui/material/List'
-} from "@mui/material";
+import ListItemButton from '@mui/material/ListItemButton'
-import { grey } from "@mui/material/colors";
+import ListItemIcon from '@mui/material/ListItemIcon'
-import ListItemButton from '@mui/material/ListItemButton';
+import ListItemText from '@mui/material/ListItemText'
-import { useMemo, useState } from "react";
+import Toolbar from '@mui/material/Toolbar'
-import { Provider, useSelector } from "react-redux";
+import Typography from '@mui/material/Typography'
-import {
+import DownloadIcon from '@mui/icons-material/Download';
-  BrowserRouter as Router, Link, Route,
+
-  Routes
+import { grey } from '@mui/material/colors'
-} from 'react-router-dom';
+
-import { AppBar } from "./components/AppBar";
+import { Suspense, lazy, useMemo, useState } from 'react'
-import { Drawer } from "./components/Drawer";
+import { Provider, useDispatch, useSelector } from 'react-redux'
-import Home from "./Home";
+
-import Settings from "./Settings";
+import { BrowserRouter, Link, Route, Routes } from 'react-router-dom'
-import { RootState, store } from './stores/store';
+import { RootState, store } from './stores/store'
-import { formatGiB, getWebSocketEndpoint } from "./utils";
+
+import AppBar from './components/AppBar'
+import Drawer from './components/Drawer'
+
+import Archive from './Archive'
+import { formatGiB } from './utils'
 
 function AppContent() {
   const [open, setOpen] = useState(false)
@@ -36,8 +41,6 @@ function AppContent() {
   const settings = useSelector((state: RootState) => state.settings)
   const status = useSelector((state: RootState) => state.status)
 
-  const socket = useMemo(() => new WebSocket(getWebSocketEndpoint()), [])
-
   const mode = settings.theme
   const theme = useMemo(() =>
     createTheme({
@@ -54,9 +57,12 @@ function AppContent() {
     setOpen(!open)
   }
 
+  const Home = lazy(() => import('./Home'))
+  const Settings = lazy(() => import('./Settings'))
+
   return (
     <ThemeProvider theme={theme}>
-      <Router>
+      <BrowserRouter>
         <Box sx={{ display: 'flex' }}>
           <CssBaseline />
           <AppBar position="absolute" open={open}>
@@ -132,6 +138,19 @@ function AppContent() {
                   <ListItemText primary="Home" />
                 </ListItemButton>
               </Link>
+              <Link to={'/archive'} style={
+                {
+                  textDecoration: 'none',
+                  color: mode === 'dark' ? '#ffffff' : '#000000DE'
+                }
+              }>
+                <ListItemButton disabled={status.downloading}>
+                  <ListItemIcon>
+                    <DownloadIcon />
+                  </ListItemIcon>
+                  <ListItemText primary="Archive" />
+                </ListItemButton>
+              </Link>
               <Link to={'/settings'} style={
                 {
                   textDecoration: 'none',
@@ -157,14 +176,27 @@ function AppContent() {
           >
             <Toolbar />
             <Routes>
-              <Route path="/" element={<Home socket={socket} />} />
+              <Route path="/" element={
-              <Route path="/settings" element={<Settings socket={socket} />} />
+                <Suspense fallback={<CircularProgress />}>
+                  <Home />
+                </Suspense>
+              } />
+              <Route path="/settings" element={
+                <Suspense fallback={<CircularProgress />}>
+                  <Settings />
+                </Suspense>
+              } />
+              <Route path="/archive" element={
+                <Suspense fallback={<CircularProgress />}>
+                  <Archive />
+                </Suspense>
+              } />
             </Routes>
           </Box>
         </Box>
-      </Router>
+      </BrowserRouter>
     </ThemeProvider>
-  );
+  )
 }
 
 export function App() {
@@ -172,5 +204,5 @@ export function App() {
     <Provider store={store}>
       <AppContent />
     </Provider>
-  );
+  )
 }

frontend/src/Archive.tsx

@@ -0,0 +1,221 @@
+import {
+  Backdrop,
+  Button,
+  Checkbox,
+  CircularProgress,
+  Container,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogContentText,
+  DialogTitle,
+  List,
+  ListItem,
+  ListItemButton,
+  ListItemIcon,
+  ListItemText,
+  Paper,
+  SpeedDial,
+  SpeedDialAction,
+  SpeedDialIcon,
+  Typography
+} from '@mui/material'
+
+import DeleteForeverIcon from '@mui/icons-material/DeleteForever'
+import VideoFileIcon from '@mui/icons-material/VideoFile'
+import FolderIcon from '@mui/icons-material/Folder'
+import { Buffer } from 'buffer'
+import { useEffect, useMemo, useState, useTransition } from 'react'
+import { useSelector } from 'react-redux'
+import { BehaviorSubject, Subject, combineLatestWith, map, share } from 'rxjs'
+import { useObservable } from './hooks/observable'
+import { RootState } from './stores/store'
+import { DeleteRequest, DirectoryEntry } from './types'
+
+export default function Downloaded() {
+  const settings = useSelector((state: RootState) => state.settings)
+
+  const [openDialog, setOpenDialog] = useState(false)
+
+  const serverAddr =
+    `${window.location.protocol}//${settings.serverAddr}:${settings.serverPort}`
+
+  const files$ = useMemo(() => new Subject<DirectoryEntry[]>(), [])
+  const selected$ = useMemo(() => new BehaviorSubject<string[]>([]), [])
+
+  const [isPending, startTransition] = useTransition()
+
+  const fetcher = () => fetch(`${serverAddr}/downloaded`, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify({ subdir: '' })
+  })
+    .then(res => res.json())
+    .then(data => files$.next(data))
+
+  const fetcherSubfolder = (sub: string) => {
+    const folders = sub.split('/')
+
+    let subdir = folders.length > 2
+      ? folders.slice(-(folders.length - 1)).join('/')
+      : folders.pop()
+
+    fetch(`${serverAddr}/downloaded`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({ subdir: subdir })
+    })
+      .then(res => res.json())
+      .then(data => {
+        files$.next([{
+          isDirectory: true,
+          name: '..',
+          path: '',
+        }, ...data])
+      })
+  }
+
+  const selectable$ = useMemo(() => files$.pipe(
+    combineLatestWith(selected$),
+    map(([data, selected]) => data.map(x => ({
+      ...x,
+      selected: selected.includes(x.name)
+    }))),
+    share()
+  ), [])
+
+  const selectable = useObservable(selectable$, [])
+
+  const addSelected = (name: string) => {
+    selected$.value.includes(name)
+      ? selected$.next(selected$.value.filter(val => val !== name))
+      : selected$.next([...selected$.value, name])
+  }
+
+  const deleteSelected = () => {
+    Promise.all(selectable
+      .filter(entry => entry.selected)
+      .map(entry => fetch(`${serverAddr}/delete`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          path: entry.path,
+          shaSum: entry.shaSum,
+        } as DeleteRequest)
+      }))
+    ).then(fetcher)
+  }
+
+  useEffect(() => {
+    fetcher()
+  }, [settings.serverAddr, settings.serverPort])
+
+
+  const onFileClick = (path: string) => startTransition(() => {
+    window.open(`${serverAddr}/play?path=${Buffer.from(path).toString('hex')}`)
+  })
+
+  const onFolderClick = (path: string) => startTransition(() => {
+    fetcherSubfolder(path)
+  })
+
+  return (
+    <Container maxWidth="lg" sx={{ mt: 4, mb: 4 }}>
+      <Backdrop
+        sx={{ color: '#fff', zIndex: (theme) => theme.zIndex.drawer + 1 }}
+        open={!(files$.observed) || isPending}
+      >
+        <CircularProgress color="primary" />
+      </Backdrop>
+      <Paper sx={{
+        p: 2,
+        display: 'flex',
+        flexDirection: 'column',
+      }}>
+        <Typography pb={0} variant="h5" color="primary">
+          {'Archive'}
+        </Typography>
+        <List sx={{ width: '100%', bgcolor: 'background.paper' }}>
+          {selectable.length === 0 && 'No files found'}
+          {selectable.map((file, idx) => (
+            <ListItem
+              key={idx}
+              secondaryAction={
+                !file.isDirectory && <Checkbox
+                  edge="end"
+                  checked={file.selected}
+                  onChange={() => addSelected(file.name)}
+                />
+              }
+              disablePadding
+            >
+              <ListItemButton onClick={
+                () => file.isDirectory
+                  ? onFolderClick(file.path)
+                  : onFileClick(file.path)
+              }>
+                <ListItemIcon>
+                  {file.isDirectory
+                    ? <FolderIcon />
+                    : <VideoFileIcon />
+                  }
+                </ListItemIcon>
+                <ListItemText primary={file.name} />
+              </ListItemButton>
+            </ListItem>
+          ))}
+        </List>
+      </Paper>
+      <SpeedDial
+        ariaLabel="SpeedDial basic example"
+        sx={{ position: 'absolute', bottom: 32, right: 32 }}
+        icon={<SpeedDialIcon />}
+      >
+        <SpeedDialAction
+          icon={<DeleteForeverIcon />}
+          tooltipTitle={`Delete selected`}
+          tooltipOpen
+          onClick={() => {
+            if (selected$.value.length > 0) {
+              setOpenDialog(true)
+            }
+          }}
+        />
+      </SpeedDial>
+      <Dialog
+        open={openDialog}
+        onClose={() => setOpenDialog(false)}
+      >
+        <DialogTitle>
+          Are you sure?
+        </DialogTitle>
+        <DialogContent>
+          <DialogContentText id="alert-dialog-description">
+            You're deleting:
+          </DialogContentText>
+          <ul>
+            {selected$.value.map((entry, idx) => (
+              <li key={idx}>{entry}</li>
+            ))}
+          </ul>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={() => setOpenDialog(false)}>Cancel</Button>
+          <Button onClick={() => {
+            deleteSelected()
+            setOpenDialog(false)
+          }} autoFocus
+          >
+            Ok
+          </Button>
+        </DialogActions>
+      </Dialog>
+    </Container>
+  )
+}

frontend/src/Home.tsx

@@ -1,8 +1,9 @@
-import { FileUpload } from "@mui/icons-material";
+import { FileUpload } from '@mui/icons-material'
+import FormatListBulleted from '@mui/icons-material/FormatListBulleted'
 import {
+  Alert,
   Backdrop,
   Button,
-  ButtonGroup,
   CircularProgress,
   Container,
   FormControl,
@@ -14,65 +15,86 @@ import {
   Paper,
   Select,
   Snackbar,
+  SpeedDial,
+  SpeedDialAction,
+  SpeedDialIcon,
   styled,
-  TextField,
+  TextField
-  Typography
+} from '@mui/material'
-} from "@mui/material";
+import { Buffer } from 'buffer'
-import { Buffer } from 'buffer';
+import { useEffect, useMemo, useRef, useState } from 'react'
-import { Fragment, useEffect, useMemo, useState } from "react";
+import { useDispatch, useSelector } from 'react-redux'
-import { useDispatch, useSelector } from "react-redux";
+import { DownloadsCardView } from './components/DownloadsCardView'
-import { StackableResult } from "./components/StackableResult";
+import { DownloadsListView } from './components/DownloadsListView'
-import { CliArguments } from "./features/core/argsParser";
+import FormatsGrid from './components/FormatsGrid'
-import I18nBuilder from "./features/core/intl";
+import { CliArguments } from './features/core/argsParser'
-import { RPCClient } from "./features/core/rpcClient";
+import I18nBuilder from './features/core/intl'
-import { connected, setFreeSpace } from "./features/status/statusSlice";
+import { RPCClient, socket$ } from './features/core/rpcClient'
-import { RootState } from "./stores/store";
+import { toggleListView } from './features/settings/settingsSlice'
-import { IDLMetadata, RPCResult } from "./types";
+import { connected, setFreeSpace } from './features/status/statusSlice'
-import { isValidURL, toFormatArgs } from "./utils";
+import { RootState } from './stores/store'
+import type { DLMetadata, RPCResponse, RPCResult } from './types'
+import { isValidURL, toFormatArgs } from './utils'
 
-type Props = {
+export default function Home() {
-  socket: WebSocket
-}
-
-export default function Home({ socket }: Props) {
   // redux state
   const settings = useSelector((state: RootState) => state.settings)
   const status = useSelector((state: RootState) => state.status)
   const dispatch = useDispatch()
 
   // ephemeral state
-  const [activeDownloads, setActiveDownloads] = useState(new Array<RPCResult>());
+  const [activeDownloads, setActiveDownloads] = useState<Array<RPCResult>>()
-  const [downloadFormats, setDownloadFormats] = useState<IDLMetadata>();
+  const [downloadFormats, setDownloadFormats] = useState<DLMetadata>()
-  const [pickedVideoFormat, setPickedVideoFormat] = useState('');
+  const [pickedVideoFormat, setPickedVideoFormat] = useState('')
-  const [pickedAudioFormat, setPickedAudioFormat] = useState('');
+  const [pickedAudioFormat, setPickedAudioFormat] = useState('')
-  const [pickedBestFormat, setPickedBestFormat] = useState('');
+  const [pickedBestFormat, setPickedBestFormat] = useState('')
 
-  const [customArgs, setCustomArgs] = useState('');
+  const [customArgs, setCustomArgs] = useState('')
-  const [downloadPath, setDownloadPath] = useState(0);
+  const [downloadPath, setDownloadPath] = useState(0)
-  const [availableDownloadPaths, setAvailableDownloadPaths] = useState<string[]>([]);
+  const [availableDownloadPaths, setAvailableDownloadPaths] = useState<string[]>([])
 
-  const [fileNameOverride, setFilenameOverride] = useState('');
+  const [fileNameOverride, setFilenameOverride] = useState('')
 
-  const [url, setUrl] = useState('');
+  const [url, setUrl] = useState('')
-  const [workingUrl, setWorkingUrl] = useState('');
+  const [workingUrl, setWorkingUrl] = useState('')
 
-  const [showBackdrop, setShowBackdrop] = useState(false);
+  const [showBackdrop, setShowBackdrop] = useState(true)
-  const [showToast, setShowToast] = useState(true);
+  const [showToast, setShowToast] = useState(true)
+
+  const [socketHasError, setSocketHasError] = useState(false)
 
   // memos
   const i18n = useMemo(() => new I18nBuilder(settings.language), [settings.language])
-  const client = useMemo(() => new RPCClient(socket), [settings.serverAddr, settings.serverPort])
+  const client = useMemo(() => new RPCClient(), [settings.serverAddr, settings.serverPort])
   const cliArgs = useMemo(() => new CliArguments().fromString(settings.cliArgs), [settings.cliArgs])
 
+  // refs
+  const urlInputRef = useRef<HTMLInputElement>(null)
+  const customFilenameInputRef = useRef<HTMLInputElement>(null)
+
   /* -------------------- Effects -------------------- */
+
   /* WebSocket connect event handler*/
   useEffect(() => {
-    socket.onopen = () => {
+    if (!status.connected) {
+      const sub = socket$.subscribe({
+        next: () => {
           dispatch(connected())
           setCustomArgs(localStorage.getItem('last-input-args') ?? '')
           setFilenameOverride(localStorage.getItem('last-filename-override') ?? '')
+        },
+        error: () => {
+          setSocketHasError(true)
+          setShowBackdrop(false)
+        },
+        complete: () => {
+          setSocketHasError(true)
+          setShowBackdrop(false)
+        },
+      })
+      return () => sub.unsubscribe()
     }
-  }, [])
+  }, [socket$, status.connected])
 
   useEffect(() => {
     if (status.connected) {
@@ -83,32 +105,33 @@ export default function Home({ socket }: Props) {
   }, [status.connected])
 
   useEffect(() => {
-    client.freeSpace()
+    client.freeSpace().then(bytes => dispatch(setFreeSpace(bytes.result)))
-      .then(bytes => dispatch(setFreeSpace(bytes.result)))
   }, [])
 
   useEffect(() => {
-    socket.onmessage = (event) => {
+    if (status.connected) {
-      const res = client.decode(event.data)
+      const sub = socket$.subscribe((event: RPCResponse<RPCResult[]>) => {
-      switch (typeof res.result) {
+        switch (typeof event.result) {
           case 'object':
             setActiveDownloads(
-            (res.result ?? [])
+              (event.result ?? [])
-              .filter((r: RPCResult) => !!r.info.url)
+                .filter((r) => !!r.info.url)
-              .sort((a: RPCResult, b: RPCResult) => a.info.title.localeCompare(b.info.title))
+                .sort((a, b) => a.info.title.localeCompare(b.info.title))
             )
             break
           default:
             break
         }
+      })
+      return () => sub.unsubscribe()
     }
-  }, [])
+  }, [socket$, status.connected])
 
   useEffect(() => {
-    if (activeDownloads.length > 0 && showBackdrop) {
+    if (activeDownloads && activeDownloads.length >= 0) {
       setShowBackdrop(false)
     }
-  }, [activeDownloads, showBackdrop])
+  }, [activeDownloads?.length])
 
   useEffect(() => {
     client.directoryTree()
@@ -117,7 +140,7 @@ export default function Home({ socket }: Props) {
       })
   }, [])
 
-  /* -------------------- component functions -------------------- */
+  /* -------------------- callbacks-------------------- */
 
   /**
    * Retrive url from input, cli-arguments from checkboxes and emits via WebSocket
@@ -137,6 +160,7 @@ export default function Home({ socket }: Props) {
 
     setUrl('')
     setWorkingUrl('')
+    setShowBackdrop(true)
 
     setTimeout(() => {
       resetInput()
@@ -220,12 +244,9 @@ export default function Home({ socket }: Props) {
   }
 
   const resetInput = () => {
-    const input = document.getElementById('urlInput') as HTMLInputElement;
+    urlInputRef.current!.value = '';
-    input.value = '';
+    if (customFilenameInputRef.current) {
-
+      customFilenameInputRef.current!.value = '';
-    const filename = document.getElementById('customFilenameInput') as HTMLInputElement;
-    if (filename) {
-      filename.value = '';
     }
   }
 
@@ -255,7 +276,7 @@ export default function Home({ socket }: Props) {
             <Grid container>
               <TextField
                 fullWidth
-                id="urlInput"
+                ref={urlInputRef}
                 label={i18n.t('urlInput')}
                 variant="outlined"
                 onChange={handleUrlChange}
@@ -276,10 +297,9 @@ export default function Home({ socket }: Props) {
             </Grid>
             <Grid container spacing={1} sx={{ mt: 1 }}>
               {
-                settings.enableCustomArgs ?
+                settings.enableCustomArgs &&
                 <Grid item xs={12}>
                   <TextField
-                      id="customArgsInput"
                     fullWidth
                     label={i18n.t('customArgsInput')}
                     variant="outlined"
@@ -287,14 +307,13 @@ export default function Home({ socket }: Props) {
                     value={customArgs}
                     disabled={!status.connected || (settings.formatSelection && downloadFormats != null)}
                   />
-                  </Grid> :
+                </Grid>
-                  null
               }
               {
-                settings.fileRenaming ?
+                settings.fileRenaming &&
                 <Grid item xs={8}>
                   <TextField
-                      id="customFilenameInput"
+                    ref={customFilenameInputRef}
                     fullWidth
                     label={i18n.t('customFilename')}
                     variant="outlined"
@@ -302,11 +321,10 @@ export default function Home({ socket }: Props) {
                     onChange={handleFilenameOverrideChange}
                     disabled={!status.connected || (settings.formatSelection && downloadFormats != null)}
                   />
-                  </Grid> :
+                </Grid>
-                  null
               }
               {
-                settings.pathOverriding ?
+                settings.pathOverriding &&
                 <Grid item xs={4}>
                   <FormControl fullWidth>
                     <InputLabel>{i18n.t('customPath')}</InputLabel>
@@ -322,8 +340,7 @@ export default function Home({ socket }: Props) {
                       ))}
                     </Select>
                   </FormControl>
-                  </Grid> :
+                </Grid>
-                  null
               }
             </Grid>
             <Grid container spacing={1} pt={2}>
@@ -333,7 +350,7 @@ export default function Home({ socket }: Props) {
                   disabled={url === ''}
                   onClick={() => settings.formatSelection ? sendUrlFormatSelection() : sendUrl()}
                 >
-                  {i18n.t('startButton')}
+                  {settings.formatSelection ? i18n.t('selectFormatButton') : i18n.t('startButton')}
                 </Button>
               </Grid>
               <Grid item>
@@ -349,142 +366,62 @@ export default function Home({ socket }: Props) {
         </Grid>
       </Grid >
       {/* Format Selection grid */}
-      {
+      {downloadFormats && <FormatsGrid
-        downloadFormats ? <Grid container spacing={2} mt={2}>
+        downloadFormats={downloadFormats}
-          <Grid item xs={12}>
+        onBestQualitySelected={(id) => {
-            <Paper
+          setPickedBestFormat(id)
-              sx={{
-                p: 2,
-                display: 'flex',
-                flexDirection: 'column',
-              }}
-            >
-              <Grid container>
-                <Grid item xs={12}>
-                  <Typography variant="h6" component="div" pb={1}>
-                    {downloadFormats.title}
-                  </Typography>
-                  {/* <Skeleton variant="rectangular" height={180} /> */}
-                </Grid>
-                <Grid item xs={12} pb={1}>
-                  <img src={downloadFormats.thumbnail} height={260} width="100%" style={{ objectFit: 'cover' }} />
-                </Grid>
-                {/* video only */}
-                <Grid item xs={12}>
-                  <Typography variant="body1" component="div">
-                    Best quality
-                  </Typography>
-                </Grid>
-                <Grid item pr={2} py={1}>
-                  <Button
-                    variant="contained"
-                    disabled={pickedBestFormat !== ''}
-                    onClick={() => {
-                      setPickedBestFormat(downloadFormats.best.format_id)
           setPickedVideoFormat('')
           setPickedAudioFormat('')
-                    }}>
+        }}
-                    {downloadFormats.best.format_note || downloadFormats.best.format_id} - {downloadFormats.best.vcodec}+{downloadFormats.best.acodec}
+        onVideoSelected={(id) => {
-                  </Button>
+          setPickedVideoFormat(id)
-                </Grid>
-                {/* video only */}
-                {downloadFormats.formats.filter(format => format.acodec === 'none' && format.vcodec !== 'none').length ?
-                  <Grid item xs={12}>
-                    <Typography variant="body1" component="div">
-                      Video data {downloadFormats.formats[1].acodec}
-                    </Typography>
-                  </Grid>
-                  : null
-                }
-                {downloadFormats.formats
-                  .filter(format => format.acodec === 'none' && format.vcodec !== 'none')
-                  .map((format, idx) => (
-                    <Grid item pr={2} py={1} key={idx}>
-                      <Button
-                        variant="contained"
-                        onClick={() => {
-                          setPickedVideoFormat(format.format_id)
           setPickedBestFormat('')
         }}
-                        disabled={pickedVideoFormat === format.format_id}
+        onAudioSelected={(id) => {
-                      >
+          setPickedAudioFormat(id)
-                        {format.format_note} - {format.vcodec === 'none' ? format.acodec : format.vcodec}
-                      </Button>
-                    </Grid>
-                  ))
-                }
-                {downloadFormats.formats.filter(format => format.acodec === 'none' && format.vcodec !== 'none').length ?
-                  <Grid item xs={12}>
-                    <Typography variant="body1" component="div">
-                      Audio data
-                    </Typography>
-                  </Grid>
-                  : null
-                }
-                {downloadFormats.formats
-                  .filter(format => format.acodec !== 'none' && format.vcodec === 'none')
-                  .map((format, idx) => (
-                    <Grid item pr={2} py={1} key={idx}>
-                      <Button
-                        variant="contained"
-                        onClick={() => {
-                          setPickedAudioFormat(format.format_id)
           setPickedBestFormat('')
         }}
-                        disabled={pickedAudioFormat === format.format_id}
+        onClear={() => {
-                      >
-                        {format.format_note} - {format.vcodec === 'none' ? format.acodec : format.vcodec}
-                      </Button>
-                    </Grid>
-                  ))
-                }
-                <Grid item xs={12} pt={2}>
-                  <ButtonGroup disableElevation variant="contained">
-                    <Button
-                      onClick={() => sendUrl()}
-                      disabled={!pickedBestFormat && !(pickedAudioFormat || pickedVideoFormat)}
-                    > Download
-                    </Button>
-                    <Button
-                      onClick={() => {
           setPickedAudioFormat('');
           setPickedVideoFormat('');
           setPickedBestFormat('');
         }}
-                    > Clear
+        onSubmit={sendUrl}
-                    </Button>
+        pickedBestFormat={pickedBestFormat}
-                  </ButtonGroup>
+        pickedVideoFormat={pickedVideoFormat}
-                </Grid>
+        pickedAudioFormat={pickedAudioFormat}
-              </Grid>
+      />}
-            </Paper>
-          </Grid>
-        </Grid> : null
-      }
-      <Grid container spacing={{ xs: 2, md: 2 }} columns={{ xs: 4, sm: 8, md: 12 }} pt={2}>
       {
-          activeDownloads.map(download => (
+        settings.listView ?
-            <Grid item xs={4} sm={8} md={6} key={download.id}>
+          <DownloadsListView downloads={activeDownloads ?? []} abortFunction={abort} /> :
-              <Fragment>
+          <DownloadsCardView downloads={activeDownloads ?? []} abortFunction={abort} />
-                <StackableResult
-                  title={download.info.title}
-                  thumbnail={download.info.thumbnail}
-                  percentage={download.progress.percentage}
-                  stopCallback={() => abort(download.id)}
-                  resolution={download.info.resolution ?? ''}
-                  speed={download.progress.speed}
-                  size={download.info.filesize_approx ?? 0}
-                />
-              </Fragment>
-            </Grid>
-          ))
       }
-      </Grid>
       <Snackbar
         open={showToast === status.connected}
         autoHideDuration={1500}
-        message="Connected"
         onClose={() => setShowToast(false)}
+      >
+        <Alert variant="filled" severity="success">
+          {`Connected to (${settings.serverAddr}:${settings.serverPort})`}
+        </Alert>
+      </Snackbar>
+      <Snackbar open={socketHasError}>
+        <Alert variant="filled" severity="error">
+          {`${i18n.t('rpcConnErr')} (${settings.serverAddr}:${settings.serverPort})`}
+        </Alert>
+      </Snackbar>
+      <SpeedDial
+        ariaLabel="SpeedDial basic example"
+        sx={{ position: 'absolute', bottom: 32, right: 32 }}
+        icon={<SpeedDialIcon />}
+      >
+        <SpeedDialAction
+          icon={<FormatListBulleted />}
+          tooltipTitle={`Table view`}
+          tooltipOpen
+          onClick={() => dispatch(toggleListView())}
         />
-    </Container >
+      </SpeedDial>
+    </Container>
   );
 }

frontend/src/Settings.tsx

@@ -16,15 +16,22 @@ import {
   Switch,
   TextField,
   Typography
-} from "@mui/material";
+} from '@mui/material'
-import { useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from 'react'
-import { useDispatch, useSelector } from "react-redux";
+import { useDispatch, useSelector } from 'react-redux'
-import { debounceTime, distinctUntilChanged, map, of, takeWhile } from "rxjs";
+import {
-import { CliArguments } from "./features/core/argsParser";
+  Subject,
-import I18nBuilder from "./features/core/intl";
+  debounceTime,
-import { RPCClient } from "./features/core/rpcClient";
+  distinctUntilChanged,
+  map,
+  takeWhile
+} from 'rxjs'
+import { CliArguments } from './features/core/argsParser'
+import I18nBuilder from './features/core/intl'
+import { RPCClient } from './features/core/rpcClient'
 import {
   LanguageUnion,
+  ThemeUnion,
   setCliArgs,
   setEnableCustomArgs,
   setFileRenaming,
@@ -33,32 +40,31 @@ import {
   setPathOverriding,
   setServerAddr,
   setServerPort,
-  setTheme,
+  setTheme
-  ThemeUnion
+} from './features/settings/settingsSlice'
-} from "./features/settings/settingsSlice";
+import { updated } from './features/status/statusSlice'
-import { updated } from "./features/status/statusSlice";
+import { RootState } from './stores/store'
-import { RootState } from "./stores/store";
+import { validateDomain, validateIP } from './utils'
-import { validateDomain, validateIP } from "./utils";
 
-export default function Settings({ socket }: { socket: WebSocket }) {
+export default function Settings() {
-  const settings = useSelector((state: RootState) => state.settings)
-  const status = useSelector((state: RootState) => state.status)
   const dispatch = useDispatch()
 
+  const status = useSelector((state: RootState) => state.status)
+  const settings = useSelector((state: RootState) => state.settings)
+
   const [invalidIP, setInvalidIP] = useState(false);
 
   const i18n = useMemo(() => new I18nBuilder(settings.language), [settings.language])
-  const client = useMemo(() => new RPCClient(socket), [settings.serverAddr, settings.serverPort])
+
-  const cliArgs = useMemo(() => new CliArguments().fromString(settings.cliArgs), [settings.cliArgs])
+  const client = useMemo(() => new RPCClient(), [])
-  /**
+  const cliArgs = useMemo(() => new CliArguments().fromString(settings.cliArgs), [])
-   * Update the server ip address state and localstorage whenever the input value changes.  
+
-   * Validate the ip-addr then set.s
+  const serverAddr$ = useMemo(() => new Subject<string>(), [])
-   * @param event Input change event
+  const serverPort$ = useMemo(() => new Subject<string>(), [])
-   */
+
-  const handleAddrChange = (event: any) => {
+  useEffect(() => {
-    const $serverAddr = of(event)
+    const sub = serverAddr$
       .pipe(
-        map(event => event.target.value),
         debounceTime(500),
         distinctUntilChanged()
       )
@@ -73,24 +79,21 @@ export default function Settings({ socket }: { socket: WebSocket }) {
           setInvalidIP(true)
         }
       })
-    return $serverAddr.unsubscribe()
+    return () => sub.unsubscribe()
-  }
+  }, [serverAddr$])
 
-  /**
+  useEffect(() => {
-   * Set server port
+    const sub = serverPort$
-   */
-  const handlePortChange = (event: any) => {
-    const $port = of(event)
       .pipe(
-        map(event => event.target.value),
+        debounceTime(500),
         map(val => Number(val)),
         takeWhile(val => isFinite(val) && val <= 65535),
       )
       .subscribe(port => {
         dispatch(setServerPort(port.toString()))
       })
-    return $port.unsubscribe()
+    return () => sub.unsubscribe()
-  }
+  }, [])
 
   /**
    * Language toggler handler 
@@ -107,7 +110,7 @@ export default function Settings({ socket }: { socket: WebSocket }) {
   }
 
   /**
-   * Send via WebSocket a message in order to update the yt-dlp binary from server
+   * Send via WebSocket a message to update yt-dlp binary
    */
   const updateBinary = () => {
     client.updateExecutable().then(() => dispatch(updated()))
@@ -125,7 +128,7 @@ export default function Settings({ socket }: { socket: WebSocket }) {
               minHeight: 240,
             }}
           >
-            <Typography pb={2} variant="h6" color="primary">
+            <Typography pb={3} variant="h5" color="primary">
               {i18n.t('settingsAnchor')}
             </Typography>
             <FormGroup>
@@ -136,7 +139,7 @@ export default function Settings({ socket }: { socket: WebSocket }) {
                     label={i18n.t('serverAddressTitle')}
                     defaultValue={settings.serverAddr}
                     error={invalidIP}
-                    onChange={handleAddrChange}
+                    onChange={(e) => serverAddr$.next(e.currentTarget.value)}
                     InputProps={{
                       startAdornment: <InputAdornment position="start">ws://</InputAdornment>,
                     }}
@@ -148,7 +151,7 @@ export default function Settings({ socket }: { socket: WebSocket }) {
                     fullWidth
                     label={i18n.t('serverPortTitle')}
                     defaultValue={settings.serverPort}
-                    onChange={handlePortChange}
+                    onChange={(e) => serverPort$.next(e.currentTarget.value)}
                     error={isNaN(Number(settings.serverPort)) || Number(settings.serverPort) > 65535}
                     sx={{ mb: 2 }}
                   />
@@ -186,16 +189,6 @@ export default function Settings({ socket }: { socket: WebSocket }) {
                     </Select>
                   </FormControl>
                 </Grid>
-                {/* <Grid item xs={12} md={6}>
-                  <TextField
-                    fullWidth
-                    label={'Max download speed' || i18n.t('serverPortTitle')}
-                    defaultValue={settings.serverPort}
-                    onChange={handlePortChange}
-                    error={isNaN(Number(settings.serverPort)) || Number(settings.serverPort) > 65535}
-                    sx={{ mb: 2 }}
-                  />
-                </Grid> */}
               </Grid>
               <FormControlLabel
                 control={

frontend/src/assets/i18n.yaml

@@ -4,6 +4,7 @@ languages:
     urlInput: YouTube or other supported service video URL
     statusTitle: Status
     statusReady: Ready
+    selectFormatButton: Select format
     startButton: Start
     abortAllButton: Abort All
     updateBinButton: Update yt-dlp binary
@@ -27,6 +28,7 @@ languages:
     customPath: Custom path
     customArgs: Enable custom yt-dlp args (great power = great responsabilities)
     customArgsInput: Custom yt-dlp arguments
+    rpcConnErr: Error while conencting to RPC server
   italian:
     urlInput: URL di YouTube o di qualsiasi altro servizio supportato
     statusTitle: Stato
@@ -54,6 +56,7 @@ languages:
     customPath: Custom path
     customArgs: Enable custom yt-dlp args (great power = great responsabilities)
     customArgsInput: Custom yt-dlp arguments
+    rpcConnErr: Error nella connessione al server RPC
   chinese:
     urlInput: YouTube 或其他受支持服务的视频网址
     statusTitle: 状态
@@ -81,6 +84,7 @@ languages:
     customPath: 自定义路径
     customArgs: 启用自定义 yt-dlp 参数（能力越大 = 责任越大）
     customArgsInput: 自定义 yt-dlp 参数
+    rpcConnErr: Error while conencting to RPC server
   spanish:
     urlInput: YouTube or other supported service video url
     statusTitle: Status
@@ -108,6 +112,7 @@ languages:
     customPath: Custom path
     customArgs: Enable custom yt-dlp args (great power = great responsabilities)
     customArgsInput: Custom yt-dlp arguments
+    rpcConnErr: Error while conencting to RPC server
   russian:
     urlInput: YouTube or other supported service video url
     statusTitle: Status
@@ -135,6 +140,7 @@ languages:
     customPath: Custom path
     customArgs: Enable custom yt-dlp args (great power = great responsabilities)
     customArgsInput: Custom yt-dlp arguments
+    rpcConnErr: Error while conencting to RPC server
   korean:
     urlInput: YouTube나 다른 지원되는 사이트의 URL
     statusTitle: 상태
@@ -162,10 +168,12 @@ languages:
     customPath: Custom path
     customArgs: Enable custom yt-dlp args (great power = great responsabilities)
     customArgsInput: Custom yt-dlp arguments
+    rpcConnErr: Error while conencting to RPC server
   japanese:
     urlInput: YouTubeまたはサポート済み動画のURL
     statusTitle: 状態
     statusReady: 準備
+    selectFormatButton: フォーマット選択
     startButton: 開始
     abortAllButton: すべて中止
     updateBinButton: yt-dlp更新
@@ -180,12 +188,13 @@ languages:
     toastConnected: '接続中 '
     toastUpdated: yt-dlpを更新しました!
     formatSelectionEnabler: 選択可能な動画/音源
-    themeSelect: 'Theme'
+    themeSelect: 'テーマ'
-    languageSelect: 'Language'
+    languageSelect: '言語'
-    overridesAnchor: Overrides
+    overridesAnchor: 上書き
-    pathOverrideOption: Enable output path overriding
+    pathOverrideOption: 保存するディレクトリ
-    filenameOverrideOption: Enable output file name overriding
+    filenameOverrideOption: ファイル名の上書き
-    customFilename: Custom filemame (leave blank to use default)
+    customFilename:  (空白の場合は元のファイル名)
-    customPath: Custom path
+    customPath: 保存先
-    customArgs: Enable custom yt-dlp args (great power = great responsabilities)
+    customArgs: yt-dlpのオプションの有効化 (最適設定にする場合)
-    customArgsInput: Custom yt-dlp arguments
+    customArgsInput: yt-dlpのオプション
+    rpcConnErr: Error while conencting to RPC server

frontend/src/components/AppBar.tsx

@@ -7,7 +7,7 @@ interface AppBarProps extends MuiAppBarProps {
 
 const drawerWidth = 240;
 
-export const AppBar = styled(MuiAppBar, {
+const AppBar = styled(MuiAppBar, {
   shouldForwardProp: (prop) => prop !== 'open',
 })<AppBarProps>(({ theme, open }) => ({
   zIndex: theme.zIndex.drawer + 1,
@@ -24,3 +24,5 @@ export const AppBar = styled(MuiAppBar, {
     }),
   }),
 }));
+
+export default AppBar

frontend/src/components/ArchiveResult.tsx

@@ -1,5 +1,12 @@
-import { Card, CardActionArea, CardContent, CardMedia, Skeleton, Typography } from "@mui/material";
+import {
-import { ellipsis } from "../utils";
+    Card,
+    CardActionArea,
+    CardContent,
+    CardMedia,
+    Skeleton,
+    Typography
+} from '@mui/material'
+import { ellipsis } from '../utils'
 
 type Props = {
     title: string,

frontend/src/components/DownloadsCardView.tsx

@@ -0,0 +1,34 @@
+import { Grid } from "@mui/material"
+import { Fragment } from "react"
+
+import type { RPCResult } from "../types"
+import { StackableResult } from "./StackableResult"
+
+type Props = {
+  downloads: RPCResult[]
+  abortFunction: (id: string) => void
+}
+
+export function DownloadsCardView({ downloads, abortFunction }: Props) {
+  return (
+    <Grid container spacing={{ xs: 2, md: 2 }} columns={{ xs: 4, sm: 8, md: 12 }} pt={2}>
+      {
+        downloads.map(download => (
+          <Grid item xs={4} sm={8} md={6} key={download.id}>
+            <Fragment>
+              <StackableResult
+                title={download.info.title}
+                thumbnail={download.info.thumbnail}
+                percentage={download.progress.percentage}
+                stopCallback={() => abortFunction(download.id)}
+                resolution={download.info.resolution ?? ''}
+                speed={download.progress.speed}
+                size={download.info.filesize_approx ?? 0}
+              />
+            </Fragment>
+          </Grid>
+        ))
+      }
+    </Grid>
+  )
+}

frontend/src/components/DownloadsListView.tsx

@@ -0,0 +1,82 @@
+import {
+  Button,
+  Grid,
+  LinearProgress,
+  Paper,
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableHead,
+  TableRow,
+  Typography
+} from "@mui/material"
+import { ellipsis, formatSpeedMiB, roundMiB } from "../utils"
+import type { RPCResult } from "../types"
+
+type Props = {
+  downloads: RPCResult[]
+  abortFunction: Function
+}
+
+export function DownloadsListView({ downloads, abortFunction }: Props) {
+  return (
+    <Grid container spacing={{ xs: 2, md: 2 }} columns={{ xs: 4, sm: 8, md: 12 }} pt={2}>
+      <Grid item xs={12}>
+        <TableContainer component={Paper} sx={{ minHeight: '65vh' }} elevation={2}>
+          <Table>
+            <TableHead>
+              <TableRow>
+                <TableCell>
+                  <Typography fontWeight={500} fontSize={15}>Title</Typography>
+                </TableCell>
+                <TableCell>
+                  <Typography fontWeight={500} fontSize={15}>Progress</Typography>
+                </TableCell>
+                <TableCell>
+                  <Typography fontWeight={500} fontSize={15}>Speed</Typography>
+                </TableCell>
+                <TableCell>
+                  <Typography fontWeight={500} fontSize={15}>Size</Typography>
+                </TableCell>
+                <TableCell>
+                  <Typography fontWeight={500} fontSize={15}>Actions</Typography>
+                </TableCell>
+              </TableRow>
+            </TableHead>
+            <TableBody>
+              {
+                downloads.map(download => (
+                  <TableRow key={download.id}>
+                    <TableCell>{ellipsis(download.info.title, 80)}</TableCell>
+                    <TableCell>
+                      <LinearProgress
+                        value={
+                          download.progress.percentage === '-1' ? 100 :
+                            Number(download.progress.percentage.replace('%', ''))
+                        }
+                        variant="determinate"
+                        color={download.progress.percentage === '-1' ? 'success' : 'primary'}
+                      />
+                    </TableCell>
+                    <TableCell>{formatSpeedMiB(download.progress.speed)}</TableCell>
+                    <TableCell>{roundMiB(download.info.filesize_approx ?? 0)}</TableCell>
+                    <TableCell>
+                      <Button
+                        variant="contained"
+                        size="small"
+                        onClick={() => abortFunction(download.id)}
+                      >
+                        {download.progress.percentage === '-1' ? 'Remove' : 'Stop'}
+                      </Button>
+                    </TableCell>
+                  </TableRow>
+                ))
+              }
+            </TableBody>
+          </Table>
+        </TableContainer>
+      </Grid>
+    </Grid>
+  )
+}

frontend/src/components/Drawer.tsx

@@ -1,9 +1,9 @@
-import { styled } from '@mui/material';
+import { styled } from '@mui/material'
-import MuiDrawer from '@mui/material/Drawer';
+import MuiDrawer from '@mui/material/Drawer'
 
-const drawerWidth = 240;
+const drawerWidth = 240
 
-export const Drawer = styled(MuiDrawer, { shouldForwardProp: (prop) => prop !== 'open' })(
+const Drawer = styled(MuiDrawer, { shouldForwardProp: (prop) => prop !== 'open' })(
   ({ theme, open }) => ({
     '& .MuiDrawer-paper': {
       position: 'relative',
@@ -27,4 +27,6 @@ export const Drawer = styled(MuiDrawer, { shouldForwardProp: (prop) => prop !==
       }),
     },
   }),
-);
+)
+
+export default Drawer

frontend/src/components/FormatsGrid.tsx

@@ -0,0 +1,126 @@
+import { Button, ButtonGroup, Grid, Paper, Typography } from "@mui/material"
+import type { DLMetadata } from '../types'
+
+type Props = {
+  downloadFormats: DLMetadata
+  onAudioSelected: (format: string) => void
+  onVideoSelected: (format: string) => void
+  onBestQualitySelected: (format: string) => void
+  onSubmit: () => void
+  onClear: () => void
+  pickedBestFormat: string
+  pickedAudioFormat: string
+  pickedVideoFormat: string
+}
+
+export default function FormatsGrid({
+  downloadFormats,
+  onAudioSelected,
+  onVideoSelected,
+  onBestQualitySelected,
+  onSubmit,
+  onClear,
+  pickedBestFormat,
+  pickedAudioFormat,
+  pickedVideoFormat,
+}: Props) {
+  return (
+    <Grid container spacing={2} mt={2}>
+      <Grid item xs={12}>
+        <Paper
+          sx={{
+            p: 2,
+            display: 'flex',
+            flexDirection: 'column',
+          }}
+        >
+          <Grid container>
+            <Grid item xs={12}>
+              <Typography variant="h6" component="div" pb={1}>
+                {downloadFormats.title}
+              </Typography>
+              {/* <Skeleton variant="rectangular" height={180} /> */}
+            </Grid>
+            <Grid item xs={12} pb={1}>
+              <img src={downloadFormats.thumbnail} height={260} width="100%" style={{ objectFit: 'cover' }} />
+            </Grid>
+            {/* video only */}
+            <Grid item xs={12}>
+              <Typography variant="body1" component="div">
+                Best quality
+              </Typography>
+            </Grid>
+            <Grid item pr={2} py={1}>
+              <Button
+                variant="contained"
+                disabled={pickedBestFormat !== ''}
+                onClick={() => onBestQualitySelected(downloadFormats.best.format_id)}
+              >
+                {downloadFormats.best.format_note || downloadFormats.best.format_id} - {downloadFormats.best.vcodec}+{downloadFormats.best.acodec}
+                &nbsp;({downloadFormats.best.resolution}{(downloadFormats.best.filesize_approx > 0) ? ", ~" + Math.round(downloadFormats.best.filesize_approx / 1024 / 1024) + " MiB" : ""})
+              </Button>
+            </Grid>
+            {/* video only */}
+            {downloadFormats.formats.filter(format => format.acodec === 'none' && format.vcodec !== 'none').length &&
+              <Grid item xs={12}>
+                <Typography variant="body1" component="div">
+                  Video data {downloadFormats.formats[1].acodec}
+                </Typography>
+              </Grid>
+            }
+            {downloadFormats.formats
+              .filter(format => format.acodec === 'none' && format.vcodec !== 'none')
+              .map((format, idx) => (
+                <Grid item pr={2} py={1} key={idx}>
+                  <Button
+                    variant="contained"
+                    onClick={() => onVideoSelected(format.format_id)}
+                    disabled={pickedVideoFormat === format.format_id}
+                  >
+                    {format.format_note} - {format.vcodec === 'none' ? format.acodec : format.vcodec}
+                    &nbsp;({format.resolution}{(format.filesize_approx > 0) ? ", ~" + Math.round(format.filesize_approx / 1024 / 1024) + " MiB" : ""})
+                  </Button>
+                </Grid>
+              ))
+            }
+            {downloadFormats.formats.filter(format => format.acodec === 'none' && format.vcodec !== 'none').length &&
+              <Grid item xs={12}>
+                <Typography variant="body1" component="div">
+                  Audio data
+                </Typography>
+              </Grid>
+            }
+            {downloadFormats.formats
+              .filter(format => format.acodec !== 'none' && format.vcodec === 'none')
+              .map((format, idx) => (
+                <Grid item pr={2} py={1} key={idx}>
+                  <Button
+                    variant="contained"
+                    onClick={() => onAudioSelected(format.format_id)}
+                    disabled={pickedAudioFormat === format.format_id}
+                  >
+                    {format.format_note} - {format.vcodec === 'none' ? format.acodec : format.vcodec}
+                    {(format.filesize_approx > 0) ? " (~" + Math.round(format.filesize_approx / 1024 / 1024) + " MiB)" : ""}
+                  </Button>
+                </Grid>
+              ))
+            }
+            <Grid item xs={12} pt={2}>
+              <ButtonGroup disableElevation variant="contained">
+                <Button
+                  onClick={() => onSubmit()}
+                  disabled={!pickedBestFormat && !(pickedAudioFormat || pickedVideoFormat)}
+                > Download
+                </Button>
+                <Button
+                  onClick={() => onClear()}
+                > Clear
+                </Button>
+              </ButtonGroup>
+            </Grid>
+          </Grid>
+        </Paper>
+      </Grid>
+    </Grid>
+  )
+}

frontend/src/components/StackableResult.tsx

@@ -1,4 +1,4 @@
-import { EightK, FourK, Hd, Sd } from "@mui/icons-material";
+import { EightK, FourK, Hd, Sd } from '@mui/icons-material'
 import {
   Button,
   Card,
@@ -11,9 +11,9 @@ import {
   Skeleton,
   Stack,
   Typography
-} from "@mui/material";
+} from '@mui/material'
-import { useEffect, useState } from "react";
+import { useEffect, useState } from 'react'
-import { ellipsis } from "../utils";
+import { ellipsis, formatSpeedMiB, roundMiB } from '../utils'
 
 type Props = {
   title: string,
@@ -42,6 +42,8 @@ export function StackableResult({
     }
   }, [percentage])
 
+  const percentageToNumber = () => isCompleted ? 100 : Number(percentage.replace('%', ''))
+
   const guessResolution = (xByY: string): any => {
     if (!xByY) return null;
     if (xByY.includes('4320')) return (<EightK color="primary" />);
@@ -51,11 +53,6 @@ export function StackableResult({
     return null;
   }
 
-  const percentageToNumber = () => isCompleted ? 100 : Number(percentage.replace('%', ''))
-
-  const roundMiB = (bytes: number) => `${(bytes / 1_000_000).toFixed(2)} MiB`
-  const formatSpeedMiB = (val: number) => `${roundMiB(val)}/s`
-
   return (
     <Card>
       <CardActionArea>
@@ -100,7 +97,8 @@ export function StackableResult({
           variant="contained"
           size="small"
           color="primary"
-          onClick={stopCallback}>
+          onClick={stopCallback}
+        >
           {isCompleted ? "Clear" : "Stop"}
         </Button>
       </CardActions>

frontend/src/features/core/rpcClient.ts

@@ -1,13 +1,14 @@
-import type { RPCRequest, RPCResponse, IDLMetadata } from "../../types"
+import type { DLMetadata, RPCRequest, RPCResponse } from '../../types'
 
-import { getHttpRPCEndpoint } from '../../utils'
+import { webSocket } from 'rxjs/webSocket'
+import { getHttpRPCEndpoint, getWebSocketEndpoint } from '../../utils'
+
+export const socket$ = webSocket<any>(getWebSocketEndpoint())
 
 export class RPCClient {
-  private socket: WebSocket
   private seq: number
 
-  constructor(socket: WebSocket) {
+  constructor() {
-    this.socket = socket
     this.seq = 0
   }
 
@@ -16,27 +17,28 @@ export class RPCClient {
   }
 
   private send(req: RPCRequest) {
-    this.socket.send(JSON.stringify(req))
+    socket$.next({
+      ...req,
+      id: this.incrementSeq(),
+    })
   }
 
-  private sendHTTP<T>(req: RPCRequest) {
+  private async sendHTTP<T>(req: RPCRequest) {
-    return new Promise<RPCResponse<T>>((resolve) => {
+    const res = await fetch(getHttpRPCEndpoint(), {
-      fetch(getHttpRPCEndpoint(), {
       method: 'POST',
       body: JSON.stringify({
+        ...req,
         id: this.incrementSeq(),
-          ...req
       })
     })
-        .then(res => res.json())
+    const data: RPCResponse<T> = await res.json()
-        .then(data => resolve(data))
+
-    })
+    return data
   }
 
   public download(url: string, args: string, pathOverride = '', renameTo = '') {
     if (url) {
       this.send({
-        id: this.incrementSeq(),
         method: 'Service.Exec',
         params: [{
           URL: url.split("?list").at(0)!,
@@ -50,8 +52,7 @@ export class RPCClient {
 
   public formats(url: string) {
     if (url) {
-      return this.sendHTTP<IDLMetadata>({
+      return this.sendHTTP<DLMetadata>({
-        id: this.incrementSeq(),
         method: 'Service.Formats',
         params: [{
           URL: url.split("?list").at(0)!,
@@ -62,7 +63,6 @@ export class RPCClient {
 
   public running() {
     this.send({
-      id: this.incrementSeq(),
       method: 'Service.Running',
       params: [],
     })
@@ -102,8 +102,4 @@ export class RPCClient {
       params: []
     })
   }
-
-  public decode(data: any): RPCResponse<any> {
-    return JSON.parse(data)
-  }
 }

frontend/src/features/settings/settingsSlice.ts

@@ -14,6 +14,7 @@ export interface SettingsState {
     fileRenaming: boolean
     pathOverriding: boolean
     enableCustomArgs: boolean
+    listView: boolean
 }
 
 const initialState: SettingsState = {
@@ -27,6 +28,7 @@ const initialState: SettingsState = {
     fileRenaming: localStorage.getItem("file-renaming") === "true",
     pathOverriding: localStorage.getItem("path-overriding") === "true",
     enableCustomArgs: localStorage.getItem("enable-custom-args") === "true",
+    listView: localStorage.getItem("listview") === "true",
 }
 
 export const settingsSlice = createSlice({
@@ -73,6 +75,10 @@ export const settingsSlice = createSlice({
             state.enableCustomArgs = action.payload
             localStorage.setItem("enable-custom-args", action.payload.toString())
         },
+        toggleListView: (state) => {
+            state.listView = !state.listView
+            localStorage.setItem("listview", state.listView.toString())
+        },
     }
 })
 
@@ -87,6 +93,7 @@ export const {
     setFileRenaming,
     setPathOverriding,
     setEnableCustomArgs,
+    toggleListView
 } = settingsSlice.actions
 
 export default settingsSlice.reducer

frontend/src/hooks/observable.ts

@@ -0,0 +1,44 @@
+import { useEffect, useState } from 'react'
+import { Observable } from 'rxjs'
+
+/**
+ * Handles the subscription and unsubscription from an observable.
+ * Automatically disposes the subscription.
+ * @param source$ source observable
+ * @param nextHandler subscriber function
+ * @param errHandler error catching callback
+ */
+export function useSubscription<T>(
+  source$: Observable<T>,
+  nextHandler: (value: T) => void,
+  errHandler?: (err: any) => void,
+) {
+  useEffect(() => {
+    if (source$) {
+      const sub = source$.subscribe({
+        next: nextHandler,
+        error: errHandler,
+      })
+      return () => sub.unsubscribe()
+    }
+  }, [source$])
+}
+
+/**
+ * Use an observable as state
+ * @param source$ source observable
+ * @param initialState the initial state prior to the emission
+ * @param errHandler error catching callback
+ * @returns value emitted to the observable
+ */
+export function useObservable<T>(
+  source$: Observable<T>,
+  initialState: T,
+  errHandler?: (err: any) => void,
+): T {
+  const [value, setValue] = useState(initialState)
+
+  useSubscription(source$, setValue, errHandler)
+
+  return value
+}

frontend/src/index.tsx

@@ -1,10 +1,10 @@
-import React from 'react'
+import { StrictMode } from 'react'
-import ReactDOM from 'react-dom/client'
+import { createRoot } from 'react-dom/client'
 import { App } from './App'
 
-const root = ReactDOM.createRoot(document.getElementById('root')!)
+const root = createRoot(document.getElementById('root')!)
 root.render(
-    <React.StrictMode>
+    <StrictMode>
-        <App></App>
+        <App />
-    </React.StrictMode>
+    </StrictMode>
 )

frontend/src/types/index.d.ts

@@ -10,13 +10,13 @@ export type RPCMethods =
   | "Service.UpdateExecutable"
 
 export type RPCRequest = {
-  method: RPCMethods,
+  method: RPCMethods
-  params?: any[],
+  params?: any[]
   id?: string
 }
 
 export type RPCResponse<T> = {
-  result: T,
+  result: T
   error: number | null
   id?: string
 }
@@ -45,18 +45,31 @@ export type RPCParams = {
   Params?: string
 }
 
-export interface IDLMetadata {
+export interface DLMetadata {
-  formats: Array<IDLFormat>,
+  formats: Array<DLFormat>
-  best: IDLFormat,
+  best: DLFormat
-  thumbnail: string,
+  thumbnail: string
-  title: string,
+  title: string
 }
 
-export interface IDLFormat {
+export type DLFormat = {
-  format_id: string,
+  format_id: string
-  format_note: string,
+  format_note: string
-  fps: number,
+  fps: number
-  resolution: string,
+  resolution: string
-  vcodec: string,
+  vcodec: string
-  acodec: string,
+  acodec: string
+  filesize_approx: number
 }
+
+export type DirectoryEntry = {
+  name: string
+  path: string
+  shaSum: string
+  isDirectory: boolean
+}
+
+export type DeleteRequest = Omit<DirectoryEntry, 'name' | 'isDirectory'>
+
+export type PlayRequest = Omit<DirectoryEntry, 'shaSum' | 'name' | 'isDirectory'>
+

frontend/src/utils.ts

@@ -74,13 +74,21 @@ export function toFormatArgs(codes: string[]): string {
 }
 
 export function getWebSocketEndpoint() {
-    return `ws://${localStorage.getItem('server-addr') || window.location.hostname}:${localStorage.getItem('server-port') || window.location.port}/ws-rpc`
+    const protocol = window.location.protocol === 'https:' ? 'wss' : 'ws'
+    return `${protocol}://${localStorage.getItem('server-addr') || window.location.hostname}:${localStorage.getItem('server-port') || window.location.port}/ws-rpc`
 }
 
 export function getHttpRPCEndpoint() {
     return `${window.location.protocol}//${localStorage.getItem('server-addr') || window.location.hostname}:${localStorage.getItem('server-port') || window.location.port}/http-rpc`
 }
 
+export function getHttpEndpoint() {
+    return `${window.location.protocol}//${localStorage.getItem('server-addr') || window.location.hostname}:${localStorage.getItem('server-port') || window.location.port}`
+}
+
 export function formatGiB(bytes: number) {
     return `${(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`

go.mod

@@ -3,25 +3,28 @@ module github.com/marcopeocchi/yt-dlp-web-ui
 go 1.19
 
 require (
-	github.com/goccy/go-json v0.10.0
+	github.com/goccy/go-json v0.10.2
-	github.com/gofiber/fiber/v2 v2.41.0
+	github.com/gofiber/fiber/v2 v2.43.0
-	github.com/gofiber/websocket/v2 v2.1.2
+	github.com/gofiber/websocket/v2 v2.1.5
 	github.com/google/uuid v1.3.0
-	github.com/marcopeocchi/fazzoletti v0.0.0-20221114144444-1e802380a7db
+	github.com/marcopeocchi/fazzoletti v0.0.0-20230308161120-c545580f79fa
-	golang.org/x/sys v0.4.0
+	golang.org/x/sys v0.7.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	github.com/andybalholm/brotli v1.0.4 // indirect
+	github.com/andybalholm/brotli v1.0.5 // indirect
-	github.com/fasthttp/websocket v1.5.0 // indirect
+	github.com/fasthttp/websocket v1.5.2 // indirect
-	github.com/klauspost/compress v1.15.14 // indirect
+	github.com/klauspost/compress v1.16.4 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/mattn/go-isatty v0.0.18 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
-	github.com/rivo/uniseg v0.4.3 // indirect
+	github.com/philhofer/fwd v1.1.2 // indirect
-	github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d // indirect
+	github.com/rivo/uniseg v0.4.4 // indirect
+	github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 // indirect
+	github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect
+	github.com/tinylib/msgp v1.1.8 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasthttp v1.43.0 // indirect
+	github.com/valyala/fasthttp v1.45.0 // indirect
 	github.com/valyala/tcplisten v1.0.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,61 +1,93 @@
-github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
+github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
-github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
-github.com/fasthttp/websocket v1.5.0 h1:B4zbe3xXyvIdnqjOZrafVFklCUq5ZLo/TqCt5JA1wLE=
+github.com/fasthttp/websocket v1.5.2 h1:KdCb0EpLpdJpfE3IPA5YLK/aYBO3dhZcvwxz6tXe2LQ=
-github.com/fasthttp/websocket v1.5.0/go.mod h1:n0BlOQvJdPbTuBkZT0O5+jk/sp/1/VCzquR1BehI2F4=
+github.com/fasthttp/websocket v1.5.2/go.mod h1:S0KC1VBlx1SaXGXq7yi1wKz4jMub58qEnHQG9oHuqBw=
-github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA=
+github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
-github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/gofiber/fiber/v2 v2.40.1/go.mod h1:Gko04sLksnHbzLSRBFWPFdzM9Ws9pRxvvIaohJK1dsk=
+github.com/gofiber/fiber/v2 v2.43.0 h1:yit3E4kHf178B60p5CQBa/3v+WVuziWMa/G2ZNyLJB0=
-github.com/gofiber/fiber/v2 v2.41.0 h1:YhNoUS/OTjEz+/WLYuQ01xI7RXgKEFnGBKMagAu5f0M=
+github.com/gofiber/fiber/v2 v2.43.0/go.mod h1:mpS1ZNE5jU+u+BA4FbM+KKnUzJ4wzTK+FT2tG3tU+6I=
-github.com/gofiber/fiber/v2 v2.41.0/go.mod h1:RdebcCuCRFp4W6hr3968/XxwJVg0K+jr9/Ae0PFzZ0Q=
+github.com/gofiber/websocket/v2 v2.1.5 h1:2weAMr0Shb2ubhZ3+P4bkeWL+uCZ/NlgjSa1siEcvFM=
-github.com/gofiber/websocket/v2 v2.1.2 h1:EulKyLB/fJgui5+6c8irwEnYQ9FRsrLZfkrq9OfTDGc=
+github.com/gofiber/websocket/v2 v2.1.5/go.mod h1:BZZEk+XsjjF0V6/sAw00iGcB69dFb6Hb85ER9gr/xaU=
-github.com/gofiber/websocket/v2 v2.1.2/go.mod h1:S+sKWo0xeC7Wnz5h4/8f6D/NxsrLFIdWDYB3SyVO9pE=
 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/klauspost/compress v1.14.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
+github.com/klauspost/compress v1.16.4 h1:91KN02FnsOYhuunwU4ssRe8lc2JosWmizWa91B5v1PU=
-github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
+github.com/klauspost/compress v1.16.4/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
-github.com/klauspost/compress v1.15.14 h1:i7WCKDToww0wA+9qrUZ1xOjp218vfFo3nTU6UHp+gOc=
+github.com/marcopeocchi/fazzoletti v0.0.0-20230308161120-c545580f79fa h1:uaAQLGhN4SesB9inOQ1Q6EH+BwTWHQOvwhR0TIJvnYc=
-github.com/klauspost/compress v1.15.14/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
+github.com/marcopeocchi/fazzoletti v0.0.0-20230308161120-c545580f79fa/go.mod h1:RvfVo/6Sbnfra9kkvIxDW8NYOOaYsHjF0DdtMCs9cdo=
-github.com/marcopeocchi/fazzoletti v0.0.0-20221114144444-1e802380a7db h1:SmKRgCLsImPxBTIzmUpbQyv+7FembiZaq/QTwtDqar4=
-github.com/marcopeocchi/fazzoletti v0.0.0-20221114144444-1e802380a7db/go.mod h1:RvfVo/6Sbnfra9kkvIxDW8NYOOaYsHjF0DdtMCs9cdo=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
+github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw=
+github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
+github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
-github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/savsgio/gotils v0.0.0-20211223103454-d0aaa54c5899/go.mod h1:oejLrk1Y/5zOF+c/aHtXqn3TFlzzbAgPWg8zBiAHDas=
+github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 h1:rmMl4fXJhKMNWl+K+r/fq4FbbKI+Ia2m9hYBLm2h4G4=
-github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d h1:Q+gqLBOPkFGHyCJxXMRqtUgUbTjI8/Ze8vu8GGyNFwo=
+github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94/go.mod h1:90zrgN3D/WJsDd1iXHT96alCoN2KJo6/4x1DZC3wZs8=
 github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d/go.mod h1:Gy+0tqhJvgGlqnTF8CVGP0AaGRjwBtXs/a5PA0Y3+A4=
+github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee h1:8Iv5m6xEo1NR1AvpV+7XmhI4r39LGNzwUL4YpMuL5vk=
+github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee/go.mod h1:qwtSXrKuJh/zsFQ12yEE89xfCrGKK63Rr7ctU/uCo4g=
+github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw=
+github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0=
+github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasthttp v1.33.0/go.mod h1:KJRK/MXx0J+yd0c5hlR+s1tIHD72sniU8ZJjl97LIw4=
+github.com/valyala/fasthttp v1.45.0 h1:zPkkzpIn8tdHZUrVa6PzYd0i5verqiPSkgTd3bSUcpA=
-github.com/valyala/fasthttp v1.41.0/go.mod h1:f6VbjjoI3z1NDOZOv17o6RvtRSWxC77seBFc2uWtgiY=
+github.com/valyala/fasthttp v1.45.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA=
-github.com/valyala/fasthttp v1.43.0 h1:Gy4sb32C98fbzVWZlTM1oTMdLWGyvxR03VhM6cBIU4g=
-github.com/valyala/fasthttp v1.43.0/go.mod h1:f6VbjjoI3z1NDOZOv17o6RvtRSWxC77seBFc2uWtgiY=
 github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
 github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
-golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/net v0.0.0-20220111093109-d55c255bac03/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/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-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
+golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+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=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"context"
 	"embed"
 	"flag"
 	"io/fs"
@@ -11,8 +10,6 @@ import (
 	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
 )
 
-type ContextKey interface{}
-
 var (
 	port           int
 	downloadPath   string
@@ -48,9 +45,5 @@ func main() {
 	cfg.DownloadPath(downloadPath)
 	cfg.DownloaderPath(downloaderPath)
 
-	ctx := context.Background()
+	server.RunBlocking(port, frontend)
-	ctx = context.WithValue(ctx, ContextKey("port"), port)
-	ctx = context.WithValue(ctx, ContextKey("frontend"), frontend)
-
-	server.RunBlocking(ctx)
 }

server/memory_db.go

@@ -1,6 +1,8 @@
 package server
 
 import (
+	"errors"
+	"fmt"
 	"log"
 	"os"
 	"sync"
@@ -11,88 +13,76 @@ import (
 	"github.com/marcopeocchi/yt-dlp-web-ui/server/cli"
 )
 
-// In-Memory volatile Thread-Safe Key-Value Storage
+// In-Memory Thread-Safe Key-Value Storage with optional persistence
 type MemoryDB struct {
-	table map[string]*Process
+	table sync.Map
-	mu    sync.Mutex
-}
-
-// Inits the db with an empty map of string->Process pointer
-func (m *MemoryDB) New() {
-	m.table = make(map[string]*Process)
 }
 
 // Get a process pointer given its id
-func (m *MemoryDB) Get(id string) *Process {
+func (m *MemoryDB) Get(id string) (*Process, error) {
-	m.mu.Lock()
+	entry, ok := db.table.Load(id)
-	res := m.table[id]
+	if !ok {
-	m.mu.Unlock()
+		return nil, errors.New("no process found for the given key")
-	return res
+	}
+	return entry.(*Process), nil
 }
 
 // Store a pointer of a process and return its id
 func (m *MemoryDB) Set(process *Process) string {
 	id := uuid.Must(uuid.NewRandom()).String()
-	m.mu.Lock()
+	db.table.Store(id, process)
-	m.table[id] = process
-	m.mu.Unlock()
 	return id
 }
 
 // Update a process info/metadata, given the process id
-func (m *MemoryDB) Update(id string, info DownloadInfo) {
+func (m *MemoryDB) UpdateInfo(id string, info DownloadInfo) error {
-	m.mu.Lock()
+	entry, ok := db.table.Load(id)
-	if m.table[id] != nil {
+	if ok {
-		m.table[id].Info = info
+		entry.(*Process).Info = info
+		db.table.Store(id, entry)
+		return nil
 	}
-	m.mu.Unlock()
+	return fmt.Errorf("can't update row with id %s", id)
 }
 
 // Update a process progress data, given the process id
 // Used for updating completition percentage or ETA
-func (m *MemoryDB) UpdateProgress(id string, progress DownloadProgress) {
+func (m *MemoryDB) UpdateProgress(id string, progress DownloadProgress) error {
-	m.mu.Lock()
+	entry, ok := db.table.Load(id)
-	if m.table[id] != nil {
+	if ok {
-		m.table[id].Progress = progress
+		entry.(*Process).Progress = progress
+		db.table.Store(id, entry)
+		return nil
 	}
-	m.mu.Unlock()
+	return fmt.Errorf("can't update row with id %s", id)
 }
 
 // Removes a process progress, given the process id
 func (m *MemoryDB) Delete(id string) {
-	m.mu.Lock()
+	db.table.Delete(id)
-	delete(m.table, id)
-	m.mu.Unlock()
 }
 
-// Returns a slice of all currently stored processes id
+func (m *MemoryDB) Keys() *[]string {
-func (m *MemoryDB) Keys() []string {
+	running := []string{}
-	m.mu.Lock()
+	db.table.Range(func(key, value any) bool {
-	keys := make([]string, len(m.table))
+		running = append(running, key.(string))
-	i := 0
+		return true
-	for k := range m.table {
+	})
-		keys[i] = k
+	return &running
-		i++
-	}
-	m.mu.Unlock()
-	return keys
 }
 
 // Returns a slice of all currently stored processes progess
-func (m *MemoryDB) All() []ProcessResponse {
+func (m *MemoryDB) All() *[]ProcessResponse {
-	running := make([]ProcessResponse, len(m.table))
+	running := []ProcessResponse{}
-	i := 0
+	db.table.Range(func(key, value any) bool {
-	for k, v := range m.table {
+		running = append(running, ProcessResponse{
-		if v != nil {
+			Id:       key.(string),
-			running[i] = ProcessResponse{
+			Info:     value.(*Process).Info,
-				Id:       k,
+			Progress: value.(*Process).Progress,
-				Info:     v.Info,
+		})
-				Progress: v.Progress,
+		return true
-			}
+	})
-			i++
+	return &running
-		}
-	}
-	return running
 }
 
 // WIP: Persist the database in a single file named "session.dat"
@@ -100,7 +90,7 @@ func (m *MemoryDB) Persist() {
 	running := m.All()
 
 	session, err := json.Marshal(Session{
-		Processes: running,
+		Processes: *running,
 	})
 	if err != nil {
 		log.Println(cli.Red, "Failed to persist database", cli.Reset)
@@ -118,4 +108,14 @@ func (m *MemoryDB) Restore() {
 	feed, _ := os.ReadFile("session.dat")
 	session := Session{}
 	json.Unmarshal(feed, &session)
+
+	for _, proc := range session.Processes {
+		db.table.Store(proc.Id, &Process{
+			id:       proc.Id,
+			url:      proc.Info.URL,
+			Info:     proc.Info,
+			Progress: proc.Progress,
+			mem:      m,
+		})
+	}
 }

server/process.go

@@ -118,7 +118,7 @@ func (p *Process) Start(path, filename string) {
 		}
 		info := DownloadInfo{URL: p.url}
 		json.Unmarshal(stdout, &info)
-		p.mem.Update(p.id, info)
+		p.mem.UpdateInfo(p.id, info)
 	}()
 
 	// --------------- progress block --------------- //
@@ -171,6 +171,7 @@ func (p *Process) Kill() error {
 	// has been spawned with setPgid = true. To properly kill
 	// all subprocesses a SIGTERM need to be sent to the correct
 	// process group
+	if p.proc != nil {
 		pgid, err := syscall.Getpgid(p.proc.Pid)
 		if err != nil {
 			return err
@@ -179,6 +180,8 @@ func (p *Process) Kill() error {
 
 		log.Println("Killed process", p.id)
 		return err
+	}
+	return nil
 }
 
 // Returns the available format for this URL

server/rest/handlers.go

@@ -0,0 +1,135 @@
+package rest
+
+import (
+	"crypto/sha256"
+	"encoding/hex"
+	"errors"
+	"io/fs"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
+)
+
+type DirectoryEntry struct {
+	Name        string `json:"name"`
+	Path        string `json:"path"`
+	SHASum      string `json:"shaSum"`
+	IsDirectory bool   `json:"isDirectory"`
+}
+
+func isValidEntry(d fs.DirEntry) bool {
+	return !strings.HasPrefix(d.Name(), ".") &&
+		!strings.HasSuffix(d.Name(), ".part") &&
+		!strings.HasSuffix(d.Name(), ".ytdl")
+}
+
+func shaSumString(path string) string {
+	h := sha256.New()
+	h.Write([]byte(path))
+	return hex.EncodeToString(h.Sum(nil))
+}
+
+func walkDir(root string) (*[]DirectoryEntry, error) {
+	files := []DirectoryEntry{}
+
+	dirs, err := os.ReadDir(root)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, d := range dirs {
+		if !isValidEntry(d) {
+			continue
+		}
+
+		path := filepath.Join(root, d.Name())
+
+		files = append(files, DirectoryEntry{
+			Path:        path,
+			Name:        d.Name(),
+			SHASum:      shaSumString(path),
+			IsDirectory: d.IsDir(),
+		})
+	}
+
+	return &files, err
+}
+
+type ListRequest struct {
+	SubDir string `json:"subdir"`
+}
+
+func ListDownloaded(ctx *fiber.Ctx) error {
+	root := config.Instance().GetConfig().DownloadPath
+	req := new(ListRequest)
+
+	err := ctx.BodyParser(req)
+	if err != nil {
+		return err
+	}
+
+	files, err := walkDir(filepath.Join(root, req.SubDir))
+	if err != nil {
+		return err
+	}
+
+	ctx.Status(http.StatusOK)
+	return ctx.JSON(files)
+}
+
+type DeleteRequest = DirectoryEntry
+
+func DeleteFile(ctx *fiber.Ctx) error {
+	req := new(DeleteRequest)
+
+	err := ctx.BodyParser(req)
+	if err != nil {
+		return err
+	}
+
+	sum := shaSumString(req.Path)
+	if sum != req.SHASum {
+		return errors.New("shasum mismatch")
+	}
+
+	err = os.Remove(req.Path)
+	if err != nil {
+		return err
+	}
+
+	ctx.Status(fiber.StatusOK)
+	return ctx.JSON("ok")
+}
+
+type PlayRequest struct {
+	Path string
+}
+
+func PlayFile(ctx *fiber.Ctx) error {
+	path := ctx.Query("path")
+
+	if path == "" {
+		return errors.New("inexistent path")
+	}
+
+	decoded, err := hex.DecodeString(path)
+	if err != nil {
+		return err
+	}
+
+	root := config.Instance().GetConfig().DownloadPath
+
+	//TODO: further path / file validations
+
+	if strings.Contains(filepath.Dir(string(decoded)), root) {
+		ctx.SendStatus(fiber.StatusPartialContent)
+		return ctx.SendFile(string(decoded))
+	}
+
+	ctx.Status(fiber.StatusOK)
+	return ctx.SendStatus(fiber.StatusUnauthorized)
+}

server/rx/extensions.go

@@ -11,6 +11,7 @@ import "time"
 //
 // Debounce emits a string from the source channel only after a particular
 // time span determined a Go Interval
+//
 // --A--B--CD--EFG-------|>
 //
 //	-t->                 |>
@@ -18,7 +19,7 @@ import "time"
 //	             -t->    |>
 //
 // --A-----C-----G-------|>
-func Debounce(interval time.Duration, source chan string, cb func(emit string)) {
+func Debounce(interval time.Duration, source chan string, f func(emit string)) {
 	var item string
 	timer := time.NewTimer(interval)
 	for {
@@ -27,7 +28,7 @@ func Debounce(interval time.Duration, source chan string, cb func(emit string))
 			timer.Reset(interval)
 		case <-timer.C:
 			if item != "" {
-				cb(item)
+				f(item)
 			}
 		}
 	}

server/server.go

@@ -8,22 +8,22 @@ import (
 	"log"
 	"net/http"
 	"net/rpc"
+	"os"
+	"os/signal"
+	"syscall"
+	"time"
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/cors"
 	"github.com/gofiber/fiber/v2/middleware/filesystem"
 	"github.com/gofiber/websocket/v2"
+	"github.com/marcopeocchi/yt-dlp-web-ui/server/rest"
 )
 
 var db MemoryDB
 
-func init() {
+func RunBlocking(port int, frontend fs.FS) {
-	db.New()
+	db.Restore()
-}
-
-func RunBlocking(ctx context.Context) {
-	fe := ctx.Value("frontend").(fs.SubFS)
-	port := ctx.Value("port").(int)
 
 	service := new(Service)
 	rpc.Register(service)
@@ -32,12 +32,28 @@ func RunBlocking(ctx context.Context) {
 
 	app.Use(cors.New())
 	app.Use("/", filesystem.New(filesystem.Config{
-		Root: http.FS(fe),
+		Root: http.FS(frontend),
 	}))
 
+	app.Get("/settings", func(c *fiber.Ctx) error {
+		return c.Redirect("/")
+	})
+	app.Get("/archive", func(c *fiber.Ctx) error {
+		return c.Redirect("/")
+	})
+
+	app.Post("/downloaded", rest.ListDownloaded)
+
+	app.Post("/delete", rest.DeleteFile)
+	app.Get("/play", rest.PlayFile)
+
 	// RPC handlers
 	// websocket
 	app.Get("/ws-rpc", websocket.New(func(c *websocket.Conn) {
+		c.WriteMessage(websocket.TextMessage, []byte(`{
+			"status": "connected"
+		}`))
+
 		for {
 			mtype, reader, err := c.NextReader()
 			if err != nil {
@@ -56,12 +72,43 @@ func RunBlocking(ctx context.Context) {
 	app.Post("/http-rpc", func(c *fiber.Ctx) error {
 		reader := c.Context().RequestBodyStream()
 		writer := c.Response().BodyWriter()
+
 		res := NewRPCRequest(reader).Call()
 		io.Copy(writer, res)
+
 		return nil
 	})
 
 	app.Server().StreamRequestBody = true
 
+	go periodicallyPersist()
+	go gracefulShutdown(app)
+
 	log.Fatal(app.Listen(fmt.Sprintf(":%d", port)))
 }
+
+func gracefulShutdown(app *fiber.App) {
+	ctx, stop := signal.NotifyContext(context.Background(),
+		os.Interrupt,
+		syscall.SIGTERM,
+		syscall.SIGQUIT,
+	)
+
+	go func() {
+		<-ctx.Done()
+		log.Println("shutdown signal received")
+
+		defer func() {
+			db.Persist()
+			stop()
+			app.ShutdownWithTimeout(time.Second * 5)
+		}()
+	}()
+}
+
+func periodicallyPersist() {
+	for {
+		db.Persist()
+		time.Sleep(time.Minute * 5)
+	}
+}

server/service.go

@@ -40,7 +40,11 @@ func (t *Service) Exec(args DownloadSpecificArgs, result *string) error {
 
 // Progess retrieves the Progress of a specific Process given its Id
 func (t *Service) Progess(args Args, progress *DownloadProgress) error {
-	*progress = db.Get(args.Id).Progress
+	proc, err := db.Get(args.Id)
+	if err != nil {
+		return err
+	}
+	*progress = proc.Progress
 	return nil
 }
 
@@ -54,24 +58,29 @@ func (t *Service) Formats(args Args, progress *DownloadFormats) error {
 
 // Pending retrieves a slice of all Pending/Running processes ids
 func (t *Service) Pending(args NoArgs, pending *Pending) error {
-	*pending = Pending(db.Keys())
+	*pending = *db.Keys()
 	return nil
 }
 
 // Running retrieves a slice of all Processes progress
 func (t *Service) Running(args NoArgs, running *Running) error {
-	*running = db.All()
+	*running = *db.All()
 	return nil
 }
 
 // Kill kills a process given its id and remove it from the memoryDB
 func (t *Service) Kill(args string, killed *string) error {
 	log.Println("Trying killing process with id", args)
-	proc := db.Get(args)
+	proc, err := db.Get(args)
-	var err error
+
+	if err != nil {
+		return err
+	}
 	if proc != nil {
 		err = proc.Kill()
 	}
+
+	db.Delete(proc.id)
 	return err
 }
 
@@ -81,8 +90,11 @@ func (t *Service) KillAll(args NoArgs, killed *string) error {
 	log.Println("Killing all spawned processes", args)
 	keys := db.Keys()
 	var err error
-	for _, key := range keys {
+	for _, key := range *keys {
-		proc := db.Get(key)
+		proc, err := db.Get(key)
+		if err != nil {
+			return err
+		}
 		if proc != nil {
 			proc.Kill()
 		}

server/types.go

@@ -36,6 +36,7 @@ type Format struct {
 	Resolution  string  `json:"resolution"`
 	VCodec      string  `json:"vcodec"`
 	ACodec      string  `json:"acodec"`
+	Size        float32 `json:"filesize_approx"`
 }
 
 // struct representing the response sent to the client