diff --git a/logs.log b/logs.log index 38fb5f1..c27c293 100644 --- a/logs.log +++ b/logs.log @@ -93,3 +93,46 @@ [17-06-20 16:20:33] HTTP server listening on port 8080 [17-06-20 16:20:33] WebSocket server listening on 8080 [17-06-20 16:20:33] New socket connection from ip: ::1, unique id: Oxl6l70wqHl6Wx2zAAAA +[17-06-20 17:26:49] HTTP server listening on port 8080 +[17-06-20 17:26:49] WebSocket server listening on 8080 +[17-06-20 17:28:13] HTTP server listening on port 8080 +[17-06-20 17:28:13] WebSocket server listening on 8080 +[17-06-20 17:28:18] New socket connection from ip: ::1, unique id: fT8zdVwOwSDD2nNoAAAA +[17-06-20 17:28:44] HTTP server listening on port 8080 +[17-06-20 17:28:44] WebSocket server listening on 8080 +[17-06-20 17:28:45] New socket connection from ip: ::1, unique id: P28UbSx5R0voL37bAAAA +[17-06-20 17:32:00] HTTP server listening on port 8080 +[17-06-20 17:32:00] WebSocket server listening on 8080 +[17-06-20 21:10:35] HTTP server listening on port 8080 +[17-06-20 21:10:35] WebSocket server listening on 8080 +[17-06-20 21:14:15] HTTP server listening on port 8080 +[17-06-20 21:14:15] WebSocket server listening on 8080 +[17-06-20 21:14:32] HTTP server listening on port 8080 +[17-06-20 21:14:32] WebSocket server listening on 8080 +[17-06-20 21:16:10] HTTP server listening on port 8080 +[17-06-20 21:16:10] WebSocket server listening on 8080 +[17-06-20 21:16:22] HTTP server listening on port 8080 +[17-06-20 21:16:22] WebSocket server listening on 8080 +[17-06-20 21:16:34] HTTP server listening on port 8080 +[17-06-20 21:16:34] WebSocket server listening on 8080 +[17-06-20 21:17:09] HTTP server listening on port 8080 +[17-06-20 21:17:09] WebSocket server listening on 8080 +[17-06-20 21:17:10] HTTP server listening on port 8080 +[17-06-20 21:17:10] WebSocket server listening on 8080 +[17-06-20 21:17:40] HTTP server listening on port 8080 +[17-06-20 21:17:40] WebSocket server listening on 8080 +[17-06-20 21:17:46] HTTP server listening on port 8080 +[17-06-20 21:17:46] WebSocket server listening on 8080 +[17-06-20 21:17:59] HTTP server listening on port 8080 +[17-06-20 21:17:59] WebSocket server listening on 8080 +[17-06-20 21:18:05] HTTP server listening on port 8080 +[17-06-20 21:18:05] WebSocket server listening on 8080 +[17-06-20 21:18:09] HTTP server listening on port 8080 +[17-06-20 21:18:09] WebSocket server listening on 8080 +[17-06-20 21:18:29] New socket connection from ip: ::1, unique id: JLw833OMKDaFWCydAAAA +[17-06-20 21:20:46] HTTP server listening on port 8080 +[17-06-20 21:20:46] WebSocket server listening on 8080 +[17-06-20 21:20:46] New socket connection from ip: ::1, unique id: wkvDKrKrRkzOjOI4AAAA +[17-06-20 21:21:13] HTTP server listening on port 8080 +[17-06-20 21:21:13] WebSocket server listening on 8080 +[17-06-20 21:21:14] New socket connection from ip: ::1, unique id: bAhfpY-yqwMTePNpAAAA diff --git a/public/index.js b/public/index.js index 4ab590a..82fc023 100644 --- a/public/index.js +++ b/public/index.js @@ -18,3 +18,5 @@ VideoInput.oninput = () => }; Socket.on('VideoListResolution', (req) => console.log(req)); + +Socket.on('VideoListResolved') diff --git a/src/server.js b/src/server.js index 3c6f95d..a2e860c 100644 --- a/src/server.js +++ b/src/server.js @@ -70,9 +70,36 @@ async function VideoListUpdate(socket, req) const VideoArray = req.Content; - + const YoutubeRegex = /^((?:https?:)?\/\/)?((?:www|m)\.)?((?:youtube\.com|youtu.be))(\/(?:[\w\-]+\?v=|embed\/|v\/)?)([\w\-]+)(\S+)?$/; + + let ResolveQueue = []; + + Res.Content = []; + for (video of VideoArray) + { + if (YoutubeRegex.exec(video)) + { + // generate ID lol + ResolveQueue.push(video); + Res.Content.push({ + id: 1, + url: video, + valid: true, + action: 'Resolving' + }); + } else + { + Res.Content.push({ + id: 1, + url: null, + valid: false, + action: 'error' + }); + } + } + + socket.emit('VideoListResolution', Res); - socket.emit('VideoListResolution', ); }