core rework

frontend/src/App.tsx

@@ -13,6 +13,7 @@ import {
 } from "react-bootstrap";
 import { validateDomain, validateIP } from "./utils";
 import './App.css';
+import { IMessage } from "./interfaces";
 
 const socket = io(`http://${localStorage.getItem('server-addr') || 'localhost'}:3022`)
 
@@ -34,20 +35,17 @@ export function App() {
     }, [])
 
     useEffect(() => {
-        socket.on('progress', data => {
-            setMessage(data.trim())
-            if (data.trim() === 'Done!') {
+        socket.on('progress', (data: IMessage) => {
+            setMessage(`${data.status || 'starting'} | progress: ${data.progress || '?'} | size: ${data.size || '?'} | speed: ${data.dlSpeed || '?'}`)
+            if (data.status === 'Done!') {
                 setHalt(false)
+                setMessage('Done!')
                 setProgress(0)
+                return
             }
-            try {
-                const _progress = Math.ceil(data.split(" ")[2].replace('%', ''))
-                if (!isNaN(_progress)) {
-                    setProgress(_progress)
-                }
-            } catch (error) {
-                console.warn('finished or empty url or aborted')
-            }
+            setProgress(
+                Math.ceil(Number(data.progress.replace('%', '')))
+            )
         })
     }, [])
 
@@ -63,11 +61,11 @@ export function App() {
         socket.emit('send-url', url)
     }
 
-    const handleUrlChange = (e) => {
+    const handleUrlChange = (e: React.ChangeEvent<HTMLInputElement>) => {
         setUrl(e.target.value)
     }
 
-    const handleAddrChange = (e) => {
+    const handleAddrChange = (e: React.ChangeEvent<HTMLInputElement>) => {
         const input = e.target.value;
         if (validateIP(input)) {
             setInvalidIP(false)

frontend/src/interfaces.tsx

@@ -0,0 +1,11 @@
+export interface IMessage {
+    status: string,
+    progress?: string,
+    size?: string,
+    dlSpeed?: string
+}
+
+export interface IDLSpeed {
+    effective: number,
+    unit: string,
+}

frontend/src/utils.ts

@@ -1,9 +1,9 @@
-export function validateIP(ipAddr) {
+export function validateIP(ipAddr: string): boolean {
     let ipRegex = /^(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}$/gm
     return ipRegex.test(ipAddr)
 }
 
-export function validateDomain(domainName) {
+export function validateDomain(domainName: string): boolean {
     let domainRegex = /[^@ \t\r\n]+.[^@ \t\r\n]+\.[^@ \t\r\n]+/
     return domainRegex.test(domainName) || domainName === 'localhost'
 }

lib/downloader.js

@@ -17,19 +17,24 @@ const download = (socket, url) => {
     const ytldp = spawn(`./lib/yt-dlp${isWindows ? '.exe' : ''}`,
         ['-o', `${settings.download_path || 'downloads/'}%(title)s.%(ext)s`, url]
     )
-    ytldp.stdout.on('data', data => {
-        // reactive programming magic
-        from(Promise.resolve(data))  // stout as promise => Observable
+
+    from(ytldp.stdout)  // stout as observable
         .pipe(throttle(() => interval(500)))  // discard events closer than 500ms
         .subscribe({
-                next: () => {
-                    socket.emit('progress', data.toString()) // finally, emit
-                    logger('download', `Fetching ${data.toString()}`)
+            next: (stdout) => {
+                let _stdout = String(stdout)
+                socket.emit('progress', formatter(_stdout)) // finally, emit
+                //logger('download', `Fetching ${stdout}`)
+                console.log(formatter(_stdout))
+            },
+            complete: () => {
+                socket.emit('progress', { status: 'Done!' })
+                logger('download', 'Done!')
             }
         })
-    })
+
     ytldp.on('exit', () => {
-        socket.emit('progress', 'Done!')
+        socket.emit('progress', { status: 'Done!' })
         logger('download', 'Done!')
     })
 }
@@ -45,6 +50,30 @@ const abortDownload = (socket) => {
     logger('download', 'Aborted')
 }
 
+const formatter = (stdout) => {
+    const cleanStdout = stdout
+        .replace(/\s\s+/g, ' ')
+        .split(' ')
+    const status = cleanStdout[0].replace(/\[|\]|\r/g, '')
+    switch (status) {
+        case 'download':
+            return {
+                status: cleanStdout[0].replace(/\[|\]|\r/g, ''),
+                progress: cleanStdout[1],
+                size: cleanStdout[3],
+                dlSpeed: cleanStdout[5],
+            }
+        case 'merger':
+            return {
+                status: 'merging',
+                progress: '100',
+            }
+        default:
+            return { progress: '0' }
+    }
+
+}
+
 module.exports = {
     download: download,
     abortDownload: abortDownload

server.js

@@ -27,7 +27,6 @@ io.on('connection', socket => {
     socket.on('abort', () => {
         abortDownload(socket)
     })
-
     socket.on('update-bin', () => {
         ytdlpUpdater(socket)
     })