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'
 }