1.0.0-b

.dockerignore

@@ -0,0 +1,23 @@
+Dockerfile
+.dockerignore
+.git
+.gitignore
+.gitattributes
+README.md
+.npmrc
+.prettierrc
+.eslintrc.cjs
+.graphqlrc
+.editorconfig
+.svelte-kit
+.vscode
+node_modules
+build
+package
+**/.env
+
+scripts/
+downloads
+
+yt-dlp
+build.tar.gz

.env.example

@@ -1,4 +1,6 @@
+NODE_ENV=development
 HOST=0.0.0.0
 ORIGIN=https://dl.emersa.it
 YTDLP_PATH=./yt-dlp
 PUBLIC_VERSION=0.6.3
+HTTPS_PROXY=

.forgejo/workflows/ci.yaml

@@ -17,5 +17,5 @@ jobs:
           node-version: '20'
       - name: Prepare, Check, Lint and Format
         run: |
-          npm ci
+          npm i
           npm run prepare

.forgejo/workflows/dependency_check.yaml

@@ -23,10 +23,10 @@ jobs:
       - name: Update deps, install them (to change package-lock.json) and commit
         run: |
           npx npm-check-updates --target minor -u
-          npm ci
+          npm install
           git config --global user.name "forgejo-bot"
           git config --global user.email "bot@pweapon.org"
-          git add package.json || exit 0
+          git add package* || exit 0
           git commit -m "chore: update minor dependencies"
           git push origin HEAD:${GITHUB_REF#refs/heads/}
         env:

.forgejo/workflows/release.yaml

@@ -21,19 +21,19 @@ jobs:
         with:
           node-version: '20'
 
-      - name: Update deps, install them (to change package-lock.json) and commit
+      - name: Install JQ for extracting package.json version
         run: |
           apt-get update
           apt-get install -y jq
 
-      - name: Prepare, Check, Lint and Format
+      - name: Create Release
         run: |
           npm ci
           touch .env
           echo "HOST=0.0.0.0" >> .env
           echo "ORIGIN=https://dl.emersa.it" >> .env
-          echo "YTDLP_PATH=./yt-dlp" >> .env
           echo "PUBLIC_VERSION=$(cat package.json | jq .version)" >> .env
+          echo "NODE_ENV=production" >> .env
           npm run build
           cp package* build/
           cp .env build/

README.md

@@ -2,22 +2,23 @@
 
 ![version](https://git.pweapon.org/odo/dl.emersa.it/badges/release.svg 'version')
 ![status](https://git.pweapon.org/odo/dl.emersa.it/badges/workflows/ci.yaml/badge.svg 'status')
+![GNU](https://img.shields.io/badge/license-GPL--3.0-green?logo=gnu)
 
-<img src='./static/screen.webp' alt='screen' height=300>
+It's a svelte(kit) frontend + backend that uses [`yt-dlp`](https://github.com/yt-dlp/yt-dlp) to let people download audio/video files from the web.
 
-It's a svelte(kit) frontend that uses `yt-dlp` to let the user download things from the web.
+[`... we don't have the concept of users, when we refer to people, we call them people.`](https://ar.al/2020/08/07/what-is-the-small-web/)
 
-## How to Deploy
+<a href='https://dl.emersa.it'><img src='./static/screen.webp' alt='screen' height=300></a>
+
+## Self-Hosting
 
 ### Node
 
-0. Install nodejs
+- Install NodeJS
-1. Download the latest release from the [releases](https://git.pweapon.org/odo/dl.emersa.it/releases) page.
+- Create a new directory (`"${PROJECT_ROOT}"`)
-2. Unpack and decompress (`tar xvf build.tar.gz`) the release
+- run `scripts/install.sh "${PROJECT_ROOT}"`
-3. Then `cd` into it and run: `npm ci` and `npm run build`
+
-4. Copy `.env.example` to `.env`, and add needed variables
+Edit `scripts/deploy_example.sh` if you need to deploy `scaricatore` to some server using `SSH`.
-5. Run it: `node .`
-6. You can also try to configure the systemd unit file inside the `configurations` folder.
 
 ### Docker
 
@@ -25,8 +26,8 @@ It's a svelte(kit) frontend that uses `yt-dlp` to let the user download things f
 
 ## Development: getting started
 
-- Clone the repo
+- run `git clone git@git.pweapon.org:odo/dl.emersa.it.git`
-- Run `npm install` (you have to have node installed)
+- Run `cd dl.emersa.it; npm install` (you have to have node installed)
 - Run `npm run download-yt-dlp`
 - Copy `.env.example` to `.env`
 - Change `.env` to set `YTDLP_PATH` to the yt-dlp binary previously downloaded
@@ -35,7 +36,6 @@ It's a svelte(kit) frontend that uses `yt-dlp` to let the user download things f
 
 ## To do:
 
-- Proper logs (I don't like them, not useful for production build)
 - Containerfile for container build
 - Source spotify (spotdl)
 - Parse URL info without `youtube-dl-exec`

configurations/downloader.service

@@ -5,9 +5,9 @@ After=network.target
 [Service]
 User=user
 Group=user
-WorkingDirectory=<PROJECT_ROOT>
+WorkingDirectory=/home/user/downloader
-ExecStart=/usr/bin/node <PROJECT_ROOT>
+EnvironmentFile=/home/user/downloader/.env
-Environment=ORIGIN=http://example.com
+ExecStart=/usr/bin/node /home/user/downloader
 Restart=always
 RestartSec=10
 StandardOutput=syslog
@@ -16,3 +16,4 @@ SyslogIdentifier=downloader
 
 [Install]
 WantedBy=multi-user.target
+

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "dl.emersa.it",
 	"private": true,
-	"version": "0.6.9",
+	"version": "1.0.0-b",
 	"type": "module",
 	"scripts": {
 		"dev": "vite dev",
@@ -15,32 +15,34 @@
 		"lint": "prettier --check . && eslint ."
 	},
 	"devDependencies": {
-		"@eslint/compat": "^1.2.7",
+		"@eslint/compat": "^1.2.8",
-		"@eslint/js": "^9.21.0",
+		"@eslint/js": "^9.25.0",
 		"@sveltejs/adapter-node": "^5.2.12",
-		"@sveltejs/kit": "^2.17.2",
+		"@sveltejs/kit": "^2.20.7",
 		"@sveltejs/vite-plugin-svelte": "^5.0.3",
-		"@tailwindcss/vite": "^4.0.8",
+		"@tailwindcss/vite": "^4.1.4",
-		"eslint": "^9.21.0",
+		"eslint": "^9.25.0",
-		"eslint-config-prettier": "^10.0.1",
+		"eslint-config-prettier": "^10.1.2",
-		"eslint-plugin-svelte": "^2.46.1",
+		"eslint-plugin-svelte": "^3.5.1",
 		"globals": "^16.0.0",
 		"mdsvex": "^0.12.3",
-		"prettier": "^3.5.2",
+		"prettier": "^3.5.3",
 		"prettier-plugin-svelte": "^3.3.3",
 		"prettier-plugin-tailwindcss": "^0.6.11",
-		"svelte": "^5.20.2",
+		"svelte": "^5.28.1",
-		"svelte-check": "^4.1.4",
+		"svelte-check": "^4.1.6",
-		"tailwindcss": "^4.0.8",
+		"sveltekit-sse": "^0.13.18",
-		"typescript": "^5.7.3",
+		"tailwindcss": "^4.1.4",
-		"typescript-eslint": "^8.24.1",
+		"typescript": "^5.8.3",
-		"vite": "^6.1.1"
+		"typescript-eslint": "^8.30.1",
+		"vite": "^6.3.2"
 	},
 	"dependencies": {
 		"@tailwindcss/forms": "^0.5.10",
-		"@tailwindcss/postcss": "^4.0.8",
+		"@tailwindcss/postcss": "^4.1.4",
 		"@tailwindcss/typography": "^0.5.16",
-		"@types/node": "^22.13.5",
+		"@types/node": "^22.14.1",
-		"youtube-dl-exec": "^3.0.15"
+		"winston": "^3.17.0",
+		"youtube-dl-exec": "^3.0.20"
 	}
 }

scripts/configure.sh

@@ -1,11 +1,8 @@
 #!/bin/bash
-#
+
-# An example hook script to verify what is about to be committed.
+## Prepares the current environment:
-# Called by "git commit" with no arguments.  The hook should
+## - Installing dependencies
-# exit with non-zero status after issuing an appropriate message if
+## - Configuring git hooks
-# it wants to stop the commit.
-#
-# To enable this hook, rename this file to "pre-commit".
 
 set -e
 

scripts/deploy_example.sh

@@ -1,15 +1,23 @@
 #!/usr/bin/bash
 
+# This is a script for running `install.sh`
+# in a remote server using SSH.
+# Configure SSH_SERVER and PROJECT_ROOT variables
+# for using this script.
+
+###### ATTENTION ######
+# The install.sh script has a confirmation prompt
+# because it deletes the content of the PROJECT_ROOT folder,
+# just put "yes | install.sh" to automatically confirm.
+
 __dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 SSH_SERVER="example"
 PROJECT_ROOT=example_directory
+
 SSH_REMOTE_DIR="${SSH_SERVER}:${PROJECT_ROOT}"
 
-wget https://git.pweapon.org/odo/dl.emersa.it/releases/download/latest/build.tar.gz
+ssh "${SSH_SERVER}" "mkdir -p ${PROJECT_ROOT}"
-
+rsync "${__dir}/install.sh" "${SSH_SERVER}:${PROJECT_ROOT}/install.sh"
-rsync -r --delete --progress build.tar.gz "${SSH_REMOTE_DIR}"
+ssh "${SSH_SERVER}" "${PROJECT_ROOT}/install.sh ${PROJECT_ROOT}"
-
-ssh "${SSH_SERVER}" "rm -rf ${PROJECT_ROOT}; mkdir -p ${PROJECT_ROOT} ; cd ${PROJECT_ROOT} ; wget https://git.pweapon.org/odo/dl.emersa.it/releases/download/latest/build.tar.gz ; tar -xvf build.tar.gz -C . ; npm ci ; rm build.tar.gz"
-#### CHANGE YOUR ${PROJECT_ROOT}/.env (specially ORIGIN)
 ssh "${SSH_SERVER}" "systemctl restart downloader"

scripts/install.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/bash
+
+### This is a script for installing the latest release
+### of `scaricatore`.
+
+PROJECT_ROOT=$1
+PROXY=$2
+
+if [ -z ${PROJECT_ROOT+x} ]; then
+    echo "ERROR: No PROJECT_ROOT set (first argument to ${0})"
+    exit 1
+fi
+
+if [ -z ${PROXY+x} ]; then
+    echo "INFO: no proxy given"
+fi
+
+mkdir -p "${PROJECT_ROOT}"
+cd "${PROJECT_ROOT}" || exit 1
+
+read -p "We're about to run rm -rf ${PROJECT_ROOT}/*. Are you sure?" -n 1 -r
+if [[ $REPLY =~ ^[Yy]$ ]]
+then
+    rm -rf ./*
+fi
+
+wget https://git.pweapon.org/odo/dl.emersa.it/releases/download/latest/build.tar.gz
+tar -xvf build.tar.gz -C .
+rm build.tar.gz
+npm ci
+npm run download-yt-dlp
+echo "YTDLP_PATH=$(readlink -f yt-dlp)" >>.env
+echo "HTTPS_PROXY=${PROXY}" >>.env

src/app.html

@@ -7,14 +7,11 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		%sveltekit.head%
 		<style>
-			@font-face {
+			* {
-				font-family: 'Press Start 2P';
+				font-family: 'Fira Code', monospace;
-				src: url('/fonts/PressStart2P-Regular.ttf');
 			}
-
 			body {
 				background: black; /* Fallback */
-				font-family: 'Press Start 2P', sans-serif;
 				color: #37ff1456; /* Retro green text */
 				margin: 0;
 			}

src/hooks.server.ts

@@ -0,0 +1,7 @@
+import { logger } from '$lib/server/helpers';
+
+export async function handle({ event, resolve }) {
+	logger.info(`Received ${event.request.method} request: ${event.url}`);
+
+	return await resolve(event);
+}

src/lib/client/downloader.ts

@@ -0,0 +1,21 @@
+const createAnchorElement = (url: string, filename: string): HTMLAnchorElement => {
+	const anchor = document.createElement('a');
+	anchor.href = url;
+	anchor.download = filename;
+	return anchor;
+};
+export const download = async (url: string, filename: string) => {
+	const response = await fetch(url);
+
+	if (!response.ok) {
+		throw new Error('Network response was not ok');
+	}
+
+	const blob = await response.blob();
+	const objectURL = window.URL.createObjectURL(blob);
+	const anchor = createAnchorElement(url, filename);
+	document.body.appendChild(anchor);
+	anchor.click();
+	anchor.remove();
+	window.URL.revokeObjectURL(objectURL);
+};

src/lib/common/supportedFormats.json

@@ -1,6 +1,6 @@
 {
-    "mp3": "audio/mpeg",
+	"mp3": "audio/mpeg",
-    "mp4": "video/mp4",
+	"opus": "audio/ogg",
-    "opus": "audio/ogg",
+	"wav": "audio/wav",
-    "wav": "audio/wav"
+	"mp4": "video/mp4"
 }

src/lib/components/DownloadManager.svelte

@@ -1,3 +1,73 @@
 <script lang="ts">
-	let props = $props();
+	import { onMount } from 'svelte';
+	let { url, dismiss } = $props();
+
+	let visible = $state(false);
+	let progress = $state(0);
+	let filename = $state('');
+	onMount(async () => {
+		if (!url) return;
+
+		try {
+			visible = true;
+
+			const response = await fetch(url);
+			if (!response.ok) throw new Error('Download failed');
+
+			const contentDisposition: string = response?.headers?.get('content-disposition');
+			filename = contentDisposition.split('filename=')[1];
+			const contentLength: number = Number(response?.headers?.get('content-length'));
+			const reader = response?.body?.getReader();
+			const chunks: Uint8Array[] = [];
+			let receivedLength = 0;
+
+			while (true) {
+				const { done, value }: ReadableStreamReadResult<Uint8Array> = await reader.read();
+				if (done) break;
+				if (value) {
+					chunks.push(value);
+					receivedLength += value.length;
+					progress = Math.round((receivedLength / contentLength) * 100);
+				}
+			}
+
+			const blob = new Blob(chunks);
+			const downloadUrl = URL.createObjectURL(blob);
+
+			const a = document.createElement('a');
+			a.href = downloadUrl;
+			a.download = filename;
+			a.click();
+
+			URL.revokeObjectURL(downloadUrl);
+
+			setTimeout(() => {
+				visible = false;
+			}, 1500); // auto-dismiss
+		} catch (err) {
+			console.error(err);
+			visible = false;
+		}
+	});
 </script>
+
+{#if visible}
+	<div
+		class="fixed inset-0 z-50 flex items-center justify-center bg-black/80 font-mono backdrop-blur-sm"
+	>
+		<div
+			class="w-[90%] max-w-sm rounded-2xl border border-green-400 bg-[#000f00] p-6 text-sm text-green-300 shadow-2xl"
+		>
+			<p class="mb-2 text-center text-cyan-300">
+				Downloading <span class="font-semibold text-green-400">{filename}</span>
+			</p>
+			<div class="h-4 w-full overflow-hidden rounded-md border border-green-500 bg-black">
+				<div
+					class="h-full bg-gradient-to-r from-green-400 to-green-600 transition-all duration-300"
+					style="width: {progress}%"
+				/>
+			</div>
+			<p class="mt-2 text-center text-pink-400">{progress}%</p>
+		</div>
+	</div>
+{/if}

src/lib/components/Loader.svelte

@@ -1,8 +1,28 @@
-<div
+<div class="w-[150px]">
-	class=" backdrop-blur-xs bg-black/20 absolute inset-0 z-10 flex items-center justify-center "
+	<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200"
-	id="spinner"
+		><linearGradient id="a3"
->
+			><stop offset="0" stop-color="#FF156D" stop-opacity="0"></stop><stop
-	<div class="w-[150px]">
+				offset="1"
-		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200"><linearGradient id="a3"><stop offset="0" stop-color="#FF156D" stop-opacity="0"></stop><stop offset="1" stop-color="#FF156D"></stop></linearGradient><circle fill="none" stroke="url(#a3)" stroke-width="15" stroke-linecap="round" stroke-dasharray="0 44 0 44 0 44 0 44 0 360" cx="100" cy="100" r="70" transform-origin="center"><animateTransform type="rotate" attributeName="transform" calcMode="discrete" dur="2" values="360;324;288;252;216;180;144;108;72;36" repeatCount="indefinite"></animateTransform></circle></svg>
+				stop-color="#FF156D"
-	</div>
+			></stop></linearGradient
+		><circle
+			fill="none"
+			stroke="url(#a3)"
+			stroke-width="15"
+			stroke-linecap="round"
+			stroke-dasharray="0 44 0 44 0 44 0 44 0 360"
+			cx="100"
+			cy="100"
+			r="70"
+			transform-origin="center"
+			><animateTransform
+				type="rotate"
+				attributeName="transform"
+				calcMode="discrete"
+				dur="2"
+				values="360;324;288;252;216;180;144;108;72;36"
+				repeatCount="indefinite"
+			></animateTransform></circle
+		></svg
+	>
 </div>

src/lib/server/helpers.ts

@@ -1,14 +1,20 @@
 import formats from '$lib/common/supportedFormats.json';
+import winston from 'winston';
+import { dev } from '$app/environment';
 
-const formatMime = new Map(Object.entries(formats))
+export const logger = winston.createLogger({
+	level: import.meta.env.DEV ? 'debug' : 'error',
+	format: winston.format.json(),
+	transports: [new winston.transports.Console()]
+});
+const formatMime = new Map(Object.entries(formats));
+export const isURLValid = (url: string) => {
+	try {
+		new URL(url);
+	} catch {
+		return false;
+	}
 
+	return true;
+};
 export const mimeTypeMap = formatMime;
-export const contentTypeFromFormat = (format: string): string => {
-    const toReturn: string | undefined = formatMime.get(format)
-
-    if (!toReturn) {
-        throw new Error("Unsupported format")
-    }
-
-    return toReturn;
-}

src/lib/server/ytdlp.ts

@@ -2,9 +2,10 @@ import { create } from 'youtube-dl-exec';
 import { env } from '$env/dynamic/private';
 import { spawn } from 'node:child_process';
 import supportedFormats from '$lib/common/supportedFormats.json';
-import { mimeTypeMap } from '$lib/server/helpers';
+import { logger, mimeTypeMap } from '$lib/server/helpers';
 
 const YTDLP_PATH: string = env.YTDLP_PATH as string;
+const HTTPS_PROXY: string = env.HTTPS_PROXY as string;
 
 export const ytdl = create(YTDLP_PATH);
 
@@ -12,45 +13,73 @@ export const ytdl = create(YTDLP_PATH);
  * Fetch YouTube metadata (title, uploader/artist)
  */
 export async function getYouTubeMetadata(link: string) {
-	return await ytdl(link, {
+	const options = {
 		dumpSingleJson: true,
 		noCheckCertificates: true,
 		noWarnings: true,
 		preferFreeFormats: true
-	});
+	};
+
+	if (HTTPS_PROXY) {
+		options.proxy = HTTPS_PROXY;
+	}
+
+	return await ytdl(link, options);
 }
 
 /**
  * Streams the YouTube video/audio using youtube-dl-exec
  */
 export function streamYouTube(link: string, format: string): ReadableStream<Uint8Array> {
-	const mimeType: string | undefined = mimeTypeMap.get(format)
+	logger.debug(`Starting to stream: ${link}`);
+	const mimeType: string | undefined = mimeTypeMap.get(format);
 
 	if (!mimeType) {
-		throw new Error("Unsupported format");
+		throw new Error('Unsupported format');
 	}
+	logger.debug(`Given format is compatible: ${mimeType}`);
 
 	return new ReadableStream({
 		start(controller) {
-			const args = [
+			const args = ['--no-write-thumbnail', '-o', '-'];
-				'-o',
-				'-',
-			].filter(Boolean);
 
-			if(mimeType?.includes('audio')) {
+			if (HTTPS_PROXY) {
-				args.push(...['--extract-audio', '--embed-metadata', '--embed-thumbnail', '--audio-format', format])
+				args.push('--proxy', HTTPS_PROXY);
-			} else if (mimeType.includes('video')) {
-				args.push(...['--embed-metadata', '--embed-thumbnail', '--format', format])
 			}
 
-			console.info(`yt-dlp ${args.join(' ')} ${link}`)
+			if (mimeType?.includes('audio')) {
+				args.push(
+					...['--extract-audio', '--embed-metadata', '--embed-thumbnail', '--audio-format', format]
+				);
+			} else if (mimeType.includes('video')) {
+				args.push(...['--embed-metadata', '--embed-thumbnail', '--format', format]);
+			}
 
-			const process = spawn('yt-dlp', [...args, link], { stdio: ['ignore', 'pipe', 'ignore'] });
+			const cmd = `${YTDLP_PATH} ${args.join(' ')} ${link}`;
+			logger.debug(`Running: ${cmd}`);
 
-			process.stdout.on('data', (chunk) => controller.enqueue(chunk));
+			const process = spawn(YTDLP_PATH, [...args, link], {
-			process.stdout.on('end', () => controller.close());
+				cwd: '/tmp',
+				stdio: ['ignore', 'pipe', 'pipe']
+			});
+
+			process.stdout.on('data', (chunk) => {
+				try {
+					controller.enqueue(chunk);
+				} catch (ex) {
+					process.kill();
+				}
+			});
+			process.stderr.on('data', (chunk) => logger.debug(chunk.toString()));
+			process.stdout.on('end', () => {
+				try {
+					controller.close();
+				} catch (ex) {
+					logger.error(ex);
+				}
+			});
 			process.stdout.on('error', (err) => {
-				console.error('Stream error:', err);
+				logger.error('Stream error:', err);
 				controller.error(err);
 			});
 		}

src/routes/+layout.svelte

@@ -17,4 +17,11 @@
 		transform: rotate(180deg);
 		display: inline-block;
 	}
+
+	@media screen and (max-height: 600px) {
+		/* Your CSS rules here */
+		footer {
+			display: none;
+		}
+	}
 </style>

src/routes/+page.server.ts

@@ -0,0 +1,3 @@
+export const prerender = true;
+export const ssr = true;
+export const csr = true;

src/routes/+page.svelte

@@ -2,7 +2,9 @@
 	import { PUBLIC_VERSION } from '$env/static/public';
 	import supportedFormats from '$lib/common/supportedFormats.json';
 	import Loader from '$lib/components/Loader.svelte';
-	import { onMount } from 'svelte';
+	import { download } from '$lib/client/downloader';
+	import DownloadManager from '$lib/components/DownloadManager.svelte';
+	import { mount, unmount } from 'svelte';
 
 	let source = $state('youtube');
 	let link = $state('');
@@ -10,42 +12,36 @@
 	let showModal = $state(false);
 	let href = $state('');
 	let disabled = $state(true);
-	let metadata = $state(true);
+	let metadata = $state(false);
-	let downloading = $state(false);
+	let logs = $state('');
+	let downloadManager: DownloadManager | null = null;
 
 	const formats = Object.keys(supportedFormats).map((f) => {
 		return { value: f, label: f.toUpperCase() };
 	});
+	const sources = [
+		{ value: 'youtube', label: 'YouTube' },
+		{ value: 'youtube', label: 'Any Other Website' }
+	];
 
 	const toggleModal = () => {
 		showModal = !showModal;
 	};
 
-	onMount(() => {
+	const dismiss = () => {
-		document.cookie = 'downloading=0'
+		unmount(downloadManager);
-	});
+	};
+
+	const onClick = async (evt) => {
+		evt.preventDefault();
+
+		const props = $state({ url: href });
+		downloadManager = mount(DownloadManager, { target: document.body, props, events: { dismiss } });
 
-	const onClick = () => {
 		link = '';
-		downloading = true;
-		document.cookie = 'downloading=1'
-
-		const id = setInterval(() => {
-			if (document.cookie.includes('downloading=0')) {
-				console.log("FINITO!")
-				downloading = false && clearInterval(id);
-			}
-		}, 1000);
 	};
 
 	const createAnchor = () => {
-		console.log({
-			source,
-			link,
-			format,
-			metadata
-		});
-
 		if (!(source && link && format)) {
 			disabled = true;
 			return;
@@ -68,7 +64,8 @@
 		searchParams.append('source', source);
 		searchParams.append('link', link);
 		searchParams.append('format', format);
-		searchParams.append('metadata', metadata);
+
+		if (metadata) searchParams.append('metadata', '1');
 
 		href = `/download?${searchParams.toString()}`;
 	};
@@ -86,109 +83,104 @@
 
 <div
 	id="wrapper"
-	class="relative mx-auto rounded-lg bg-black p-6 text-green-500 shadow-lg sm:max-w-sm sm:border-4 sm:border-green-500 md:mt-10 md:max-w-md lg:max-w-lg 2xl:max-w-2xl"
+	class="relative mx-auto max-w-full rounded-2xl bg-black p-4 text-green-400 shadow-xl sm:max-w-sm md:max-w-md lg:max-w-lg"
 >
-	<div id="loader" class={[{ downloading }]}>
+	<!-- Loader Overlay -->
+	<div
+		id="loader"
+		class="absolute inset-0 z-10 hidden items-center justify-center bg-black/80 backdrop-blur-sm"
+	>
 		<Loader />
+		{@html logs}
 	</div>
-	<!-- Info Icon -->
+
+	<!-- Info Button -->
 	<button
 		onclick={toggleModal}
-		class="absolute top-3 right-3 text-pink-500 transition hover:text-pink-300"
+		class="absolute top-3 right-3 text-pink-500 transition hover:text-pink-400"
 		aria-label="Open Info Modal"
 	>
-		<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="h-6 w-6" viewBox="0 0 24 24">
+		<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="h-5 w-5" viewBox="0 0 24 24">
 			<path
 				d="M12 0C5.373 0 0 5.373 0 12c0 6.627 5.373 12 12 12s12-5.373 12-12C24 5.373 18.627 0 12 0zm.75 18h-1.5v-6h1.5v6zm0-8h-1.5V8h1.5v2z"
 			/>
 		</svg>
 	</button>
 
-	<h1 id="title" class="mb-6 text-center text-xl">🐙 Scaricatore 🐙</h1>
+	<!-- Title -->
-	<form class="space-y-6">
+	<p id="title" class="mb-4 text-center font-mono text-xl tracking-tight text-cyan-300">
-		<!-- Source Selection -->
+		🐙 Scaricatore 🐙
-		<fieldset class="space-y-4">
+	</p>
-			<legend class="text-green-400">Choose Source:</legend>
 
-			<label class="flex items-center space-x-3">
+	<!-- Form -->
-				<input type="radio" name="source" value="youtube" bind:group={source} class="retro-radio" />
+	<form class="space-y-5 font-mono text-sm">
-				<span>YouTube</span>
+		<!-- Source & Format -->
-			</label>
+		<div class="flex flex-col gap-4 sm:flex-row">
-
+			<div class="flex-1">
-			<label class="flex items-center space-x-3">
+				<label for="source" class="mb-1 block text-cyan-300">Source</label>
-				<input
+				<select
-					disabled
+					id="source"
-					type="radio"
 					name="source"
-					value="spotify"
+					bind:value={source}
-					bind:group={source}
+					class="w-full rounded-md border border-green-400 bg-[#000f00] px-3 py-2 text-green-300 focus:border-pink-400 focus:outline-none"
-					class="retro-radio"
+				>
-				/>
+					{#each sources as source}
-				<span class="not-available">Spotify</span>
+						<option value={source.value}>{source.label}</option>
-			</label>
+					{/each}
+				</select>
+			</div>
 
-			<label class="flex items-center space-x-3">
+			<div class="flex-1">
-				<input type="radio" name="source" value="other" bind:group={source} class="retro-radio" />
+				<label for="format" class="mb-1 block text-cyan-300">Format</label>
-				<span>
+				<select
-					Other (<a
+					id="format"
-						href="https://github.com/yt-dlp/yt-dlp/blob/master/supportedsites.md"
+					name="format"
-						target="_blank"
+					bind:value={format}
-						rel="noopener noreferrer"
+					class="w-full rounded-md border border-green-400 bg-[#000f00] px-3 py-2 text-green-300 focus:border-pink-400 focus:outline-none"
-						class="text-pink-500 hover:underline"
+				>
-						>supported sites
+					{#each formats as format}
-					</a>)
+						<option value={format.value}>{format.label}</option>
-				</span>
+					{/each}
-			</label>
+				</select>
-		</fieldset>
+			</div>
+		</div>
 
-		<!-- Link Input -->
+		<!-- Video Link -->
 		<div>
-			<label for="link" class="mb-2 block text-green-400"> Enter Playlist or Video Link: </label>
+			<label for="link" class="mb-1 block text-cyan-300">Video Link</label>
 			<input
-				name="link"
 				type="url"
 				id="link"
+				name="link"
 				bind:value={link}
 				required
-				placeholder="Paste your link here"
+				placeholder="https://..."
-				class="w-full rounded-lg border-4 border-green-500 bg-green-200 px-4 py-3 text-black focus:border-pink-500 focus:outline-none"
+				class="w-full rounded-md border border-green-400 bg-[#000f00] px-3 py-2 text-green-300 placeholder:text-green-600 focus:border-pink-400 focus:outline-none"
 			/>
 		</div>
 
-		<!-- Format Selection -->
+		<!-- Metadata Checkbox -->
-		<div>
+		<div class="flex items-center gap-2">
-			<label for="format" class="mb-2 block text-green-400"> Choose Format: </label>
-			<select
-				id="format"
-				name="format"
-				bind:value={format}
-				class="w-full rounded-lg border-4 border-green-500 bg-green-200 px-4 py-3 text-black focus:border-pink-500 focus:outline-none"
-			>
-				{#each formats as format}
-					<option value={format.value}>{format.label}</option>
-				{/each}
-			</select>
-		</div>
-
-		<!-- Format Selection -->
-		<div>
-			<label for="metadata" class="mb-2 block text-green-400"> Metadata </label>
 			<input
 				type="checkbox"
 				id="metadata"
 				name="metadata"
 				bind:checked={metadata}
-				class="rounded-lg border-4 border-green-500 bg-green-200 px-4 py-3 text-black focus:border-pink-500 focus:outline-none"
+				class="h-4 w-4 border border-green-400 bg-[#000f00] text-green-500 focus:ring-pink-400"
 			/>
+			<label for="metadata" class="text-cyan-300"
+				>Set filename (<span class="text-red-500">slow</span>)</label
+			>
 		</div>
 
+		<!-- Download Button -->
 		<a
 			id="btn-download"
 			{href}
 			onclick={onClick}
 			class="{disabled
-				? 'disabled'
+				? 'pointer-events-none opacity-50'
-				: ''} block w-full rounded-lg border-4 border-pink-700 bg-pink-500 px-4 py-3 text-center text-4xl text-black transition hover:bg-pink-600 active:border-yellow-500"
+				: ''} block w-full rounded-md border border-pink-400 bg-pink-600 px-4 py-3 text-center text-base font-bold text-black transition hover:bg-pink-500 active:border-yellow-400"
 		>
 			DOWNLOAD
 		</a>
@@ -197,78 +189,24 @@
 
 <!-- Modal -->
 {#if showModal}
-	<div class="bg-opacity-80 fixed inset-0 z-50 flex items-center justify-center bg-black">
+	<div class="fixed inset-0 z-50 flex items-center justify-center bg-black/90 text-green-300">
-		<div
+		<div class="w-[90%] max-w-md rounded-lg border border-green-400 bg-[#001a00] p-5 text-center">
-			class="w-4/5 max-w-lg rounded-lg border-4 border-green-500 bg-green-900 p-6 text-center text-green-100"
+			<h2 class="mb-3 text-base font-semibold">🐙 Scaricatore v{PUBLIC_VERSION} 🐙</h2>
-		>
-			<h2 class="mb-4 text-lg">🐙 Scaricatore v{PUBLIC_VERSION} 🐙</h2>
 			<p>
-				This app allows you to download Spotify playlists and YouTube videos directly. Choose your
+				Download Spotify playlists and YouTube videos with ease. Choose your source, paste a link,
-				source, paste the link, and select a format to start downloading!
+				select format, go!
 			</p>
-			<span class="mt-10 block">
+			<p class="mt-3">
-				<a class="underline" href="https://git.pweapon.org/odo/dl.emersa.it"
+				<a class="text-cyan-400 underline" href="https://git.pweapon.org/odo/dl.emersa.it"
-					>Click here for the source code</a
+					>Source Code</a
 				>
-			</span>
+			</p>
 			<button
 				onclick={toggleModal}
-				class="mt-6 rounded-lg border-4 border-pink-700 bg-pink-500 px-4 py-2 text-black hover:bg-pink-600"
+				class="mt-6 rounded-md border border-pink-400 bg-pink-600 px-4 py-2 text-black hover:bg-pink-500"
 			>
 				Close
 			</button>
 		</div>
 	</div>
 {/if}
-
-<style>
-	* {
-		font-size: 12px;
-	}
-
-	#loader {
-		display: none;
-	}
-	#loader.downloading {
-		display: block;
-	}
-	.not-available {
-		text-decoration-line: line-through;
-		text-decoration-color: red;
-	}
-
-	.retro-radio {
-		appearance: none;
-		background-color: #000;
-		border: 2px solid #39ff14;
-		width: 20px;
-		height: 20px;
-		cursor: pointer;
-	}
-
-	.retro-radio:checked {
-		background-color: #39ff14;
-		box-shadow:
-			0 0 4px #39ff14,
-			0 0 10px #39ff14;
-	}
-
-	input[type='url'],
-	select {
-		font-family: inherit;
-	}
-
-	#title {
-		font-size: 22px;
-	}
-
-	#btn-download {
-		font-size: 24px;
-		transition: opacity 0.3s ease;
-	}
-	a.disabled {
-		pointer-events: none;
-		cursor: default;
-		opacity: 0.4;
-	}
-</style>

src/routes/download/+server.ts

@@ -1,14 +1,14 @@
 import { error } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
 import { getYouTubeMetadata, streamYouTube, ytdl } from '$lib/server/ytdlp';
-import { contentTypeFromFormat, mimeTypeMap } from '$lib/server/helpers';
+import { isURLValid, logger, mimeTypeMap } from '$lib/server/helpers';
 
-export const GET: RequestHandler = async ({ url }) => {
+const validateRequest = (url: URL) => {
 	// Get query params
 	const link = url.searchParams.get('link');
 	const format = url.searchParams.get('format'); // mp3, mp4
 	const source = url.searchParams.get('source'); // youtube or spotify
-	const metadata = url.searchParams.get('metadata');
+	const metadata = url.searchParams.has('metadata');
 
 	// Validate input
 	if (!link || !format || !source) {
@@ -19,28 +19,54 @@ export const GET: RequestHandler = async ({ url }) => {
 		throw error(400, 'Currently, only YouTube is supported');
 	}
 
+	if (!isURLValid(link)) {
+		throw error(400, 'URL not valid');
+	}
+
+	if (!mimeTypeMap.get(format)) {
+		throw error(400, 'format not valid');
+	}
+
+	logger.debug(`Request is valid`);
+
+	return {
+		link,
+		format,
+		source,
+		metadata
+	};
+};
+export const GET: RequestHandler = async ({ url }) => {
+	const { format, source, metadata, link } = validateRequest(url);
+	let filename = '';
+	let contentLength = 0;
+
 	try {
-		let filename = `you-clicked-no-metadata-so-i-cant-put-a-correct-name.${format}`;
+		logger.debug(`Fetching video data to set filename`);
-
+		// Fetch metadata for filename
-		if (metadata) {
+		const ytMetadata = await getYouTubeMetadata(link);
-			// Fetch metadata for filename
+		const { title, uploader, filesize_approx } = ytMetadata;
-			const metadata = await getYouTubeMetadata(link);
+		contentLength = filesize_approx;
-			const { title, uploader } = metadata;
+		const safeTitle = `${uploader} - ${title}`;
-			const safeTitle = `${uploader} - ${title}`;
+		filename = `${safeTitle}.${format}`;
-			filename = `${safeTitle}.${format}`;
+	} catch (err) {
-		}
+		logger.error(err);
+		logger.error('Error fetching metadata:');
+		throw error(500, 'Failed to fetch video metadata');
+	}
 
+	try {
 		// Stream video/audio
 		return new Response(streamYouTube(link, format), {
 			headers: {
-				'Content-Type': contentTypeFromFormat(format),
+				'Content-Type': `${mimeTypeMap.get(format)}`,
-				'Content-Disposition': `attachment; filename="${filename}"`,
+				'Content-Length': contentLength,
-				'Set-Cookie': 'downloading=0'
+				'Content-Disposition': `attachment; filename="${filename}"`
 			}
 		});
 	} catch (err) {
-		console.error(err)
+		logger.error(err);
-		console.error('Error fetching metadata:');
+		logger.error('Filed to stream file');
-		throw error(500, 'Failed to fetch video metadata');
+		throw error(500, 'Failed to stream file');
 	}
 };

static/manifest.json

@@ -1,16 +1,16 @@
 {
-	"name": "EmersaDownloader",
+	"name": "scaricatore",
 	"start_url": "https://dl.emersa.it",
 	"theme_color": "rgb(34,197,94)",
 	"background": "black",
 	"orientation": "portrait",
 	"display": "fullscreen",
-	"short_name": "e-downloader",
+	"short_name": "scaricatore",
 	"icons": [
 		{
 			"src": "favicon.png",
 			"type": "image/png",
-			"sizes": "128x128"
+			"sizes": "512x512"
 		}
 	]
 }