diff --git a/.gitignore b/.gitignore index 5d5a00a..4d019d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ node_modules/ +log/ package-lock.json config.json state.json diff --git a/src/app/channel/media/playlistHandler.js b/src/app/channel/media/playlistHandler.js index ea99575..9345590 100644 --- a/src/app/channel/media/playlistHandler.js +++ b/src/app/channel/media/playlistHandler.js @@ -163,8 +163,6 @@ class playlistHandler{ } //The UUID is only validated, not processed so we just return the new time :P - console.log(this.channel) - console.log(this.channel.queue); return this.channel.queue.getStart(data.start) } diff --git a/src/utils/loggerUtils.js b/src/utils/loggerUtils.js index 0189f05..46443af 100644 --- a/src/utils/loggerUtils.js +++ b/src/utils/loggerUtils.js @@ -14,6 +14,9 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see .*/ +//Node +const fs = require('node:fs/promises'); + //Config const config = require('../../config.json'); @@ -64,7 +67,7 @@ module.exports.localExceptionHandler = function(err){ //If we're being verbose if(config.verbose){ //Log the error - console.log(err) + module.exports.dumpError(err); } } @@ -163,4 +166,21 @@ module.exports.errorMiddleware = function(err, req, res, next){ } module.exports.errorHandler(res, err.message, reason, err.status); +} + +/** + * Dumps unexpected server crashes to dedicated log files + * @param {Error} err - error to dump to file + * @param {Date} date - Date of error, defaults to now + */ +module.exports.dumpError = function(err, date = new Date()){ + try{ + const content = `Error Date: ${date.toLocaleString()} (UTC-${date.getTimezoneOffset()/60})\nError Type: ${err.name}\nError Msg:${err.message}\nStack Trace:\n\n${err.stack}`; + + fs.writeFile(`log/crash/${date.getTime()}.log`, content); + }catch(doubleErr){ + module.exports.consoleWarn("Yo Dawg, I herd you like errors, so I put an error in your error dump, so you can dump while you dump:"); + module.exports.consoleWarn(err); + module.exports.consoleWarn(doubleErr); + } } \ No newline at end of file diff --git a/www/doc/client/addURLPopup.html b/www/doc/client/addURLPopup.html index 51f27f7..9afb3a0 100644 --- a/www/doc/client/addURLPopup.html +++ b/www/doc/client/addURLPopup.html @@ -875,7 +875,7 @@
diff --git a/www/doc/client/cPanel.html b/www/doc/client/cPanel.html index 0b8d796..6e28375 100644 --- a/www/doc/client/cPanel.html +++ b/www/doc/client/cPanel.html @@ -2602,7 +2602,7 @@
diff --git a/www/doc/client/channel.html b/www/doc/client/channel.html index bb5095f..030583f 100644 --- a/www/doc/client/channel.html +++ b/www/doc/client/channel.html @@ -1254,7 +1254,7 @@
diff --git a/www/doc/client/channel.js.html b/www/doc/client/channel.js.html index 9ab6731..c713518 100644 --- a/www/doc/client/channel.js.html +++ b/www/doc/client/channel.js.html @@ -289,7 +289,7 @@ const client = new channel();
diff --git a/www/doc/client/chat.js.html b/www/doc/client/chat.js.html index 6612026..f5991b6 100644 --- a/www/doc/client/chat.js.html +++ b/www/doc/client/chat.js.html @@ -662,7 +662,7 @@ L /**
diff --git a/www/doc/client/chatBox.html b/www/doc/client/chatBox.html index f94df2a..81a0bc4 100644 --- a/www/doc/client/chatBox.html +++ b/www/doc/client/chatBox.html @@ -4650,7 +4650,7 @@ Also prevents horizontal scroll-bars from chat/window resizing
diff --git a/www/doc/client/chatPostprocessor.html b/www/doc/client/chatPostprocessor.html index 54135f1..f2f06ee 100644 --- a/www/doc/client/chatPostprocessor.html +++ b/www/doc/client/chatPostprocessor.html @@ -1794,7 +1794,7 @@ Internal command used by several text filters to prevent code re-writes
diff --git a/www/doc/client/chatPostprocessor.js.html b/www/doc/client/chatPostprocessor.js.html index 7b0a078..bbaf312 100644 --- a/www/doc/client/chatPostprocessor.js.html +++ b/www/doc/client/chatPostprocessor.js.html @@ -671,7 +671,7 @@ class chatPostprocessor{
diff --git a/www/doc/client/clearPopup.html b/www/doc/client/clearPopup.html index 3c4beb8..cf6e243 100644 --- a/www/doc/client/clearPopup.html +++ b/www/doc/client/clearPopup.html @@ -790,7 +790,7 @@
diff --git a/www/doc/client/commandPreprocessor.html b/www/doc/client/commandPreprocessor.html index 8041920..6e246c5 100644 --- a/www/doc/client/commandPreprocessor.html +++ b/www/doc/client/commandPreprocessor.html @@ -1912,7 +1912,7 @@
diff --git a/www/doc/client/commandPreprocessor.js.html b/www/doc/client/commandPreprocessor.js.html index a5f79b1..7b12efd 100644 --- a/www/doc/client/commandPreprocessor.js.html +++ b/www/doc/client/commandPreprocessor.js.html @@ -371,7 +371,7 @@ class commandProcessor{
diff --git a/www/doc/client/commandProcessor.html b/www/doc/client/commandProcessor.html index 5b5a9d2..3c0c1cb 100644 --- a/www/doc/client/commandProcessor.html +++ b/www/doc/client/commandProcessor.html @@ -421,7 +421,7 @@
diff --git a/www/doc/client/cpanel.js.html b/www/doc/client/cpanel.js.html index b3f8e3f..f457257 100644 --- a/www/doc/client/cpanel.js.html +++ b/www/doc/client/cpanel.js.html @@ -515,7 +515,7 @@ class poppedPanel{
diff --git a/www/doc/client/defaultTitlesPopup.html b/www/doc/client/defaultTitlesPopup.html index 6308448..32b3bc8 100644 --- a/www/doc/client/defaultTitlesPopup.html +++ b/www/doc/client/defaultTitlesPopup.html @@ -960,7 +960,7 @@
diff --git a/www/doc/client/emotePanel.html b/www/doc/client/emotePanel.html index 1b537af..2c10c4e 100644 --- a/www/doc/client/emotePanel.html +++ b/www/doc/client/emotePanel.html @@ -2249,7 +2249,7 @@
diff --git a/www/doc/client/global.html b/www/doc/client/global.html index 5169fca..8e96f76 100644 --- a/www/doc/client/global.html +++ b/www/doc/client/global.html @@ -208,7 +208,7 @@
diff --git a/www/doc/client/hlsBase.html b/www/doc/client/hlsBase.html index 1c7ed70..b7ca232 100644 --- a/www/doc/client/hlsBase.html +++ b/www/doc/client/hlsBase.html @@ -2919,7 +2919,7 @@
diff --git a/www/doc/client/hlsLiveStreamHandler.html b/www/doc/client/hlsLiveStreamHandler.html index 0e2ac0e..e224c82 100644 --- a/www/doc/client/hlsLiveStreamHandler.html +++ b/www/doc/client/hlsLiveStreamHandler.html @@ -2896,7 +2896,7 @@
diff --git a/www/doc/client/index.html b/www/doc/client/index.html index 0ef492d..e4fd518 100644 --- a/www/doc/client/index.html +++ b/www/doc/client/index.html @@ -87,7 +87,7 @@ This new codebase intends to solve the following issues with the current CyTube
diff --git a/www/doc/client/mediaHandler.html b/www/doc/client/mediaHandler.html index c5d957d..19ff7f9 100644 --- a/www/doc/client/mediaHandler.html +++ b/www/doc/client/mediaHandler.html @@ -2701,7 +2701,7 @@
diff --git a/www/doc/client/mediaHandler.js.html b/www/doc/client/mediaHandler.js.html index 61488f0..681285e 100644 --- a/www/doc/client/mediaHandler.js.html +++ b/www/doc/client/mediaHandler.js.html @@ -835,7 +835,7 @@ class hlsLiveStreamHandler extends hlsBase{
diff --git a/www/doc/client/newPlaylistPopup.html b/www/doc/client/newPlaylistPopup.html index fcec253..bb512fe 100644 --- a/www/doc/client/newPlaylistPopup.html +++ b/www/doc/client/newPlaylistPopup.html @@ -705,7 +705,7 @@
diff --git a/www/doc/client/nullHandler.html b/www/doc/client/nullHandler.html index f62ac7a..f3cc015 100644 --- a/www/doc/client/nullHandler.html +++ b/www/doc/client/nullHandler.html @@ -2873,7 +2873,7 @@
diff --git a/www/doc/client/panelObj.html b/www/doc/client/panelObj.html index 72febfa..5def7f1 100644 --- a/www/doc/client/panelObj.html +++ b/www/doc/client/panelObj.html @@ -909,7 +909,7 @@
diff --git a/www/doc/client/panels_emotePanel.js.html b/www/doc/client/panels_emotePanel.js.html index 908994f..b37fd8d 100644 --- a/www/doc/client/panels_emotePanel.js.html +++ b/www/doc/client/panels_emotePanel.js.html @@ -353,7 +353,7 @@ class emotePanel extends panelObj{
diff --git a/www/doc/client/panels_queuePanel_playlistManager.js.html b/www/doc/client/panels_queuePanel_playlistManager.js.html index ebe2bd2..532ca0a 100644 --- a/www/doc/client/panels_queuePanel_playlistManager.js.html +++ b/www/doc/client/panels_queuePanel_playlistManager.js.html @@ -983,7 +983,7 @@ class renamePopup{
diff --git a/www/doc/client/panels_queuePanel_queuePanel.js.html b/www/doc/client/panels_queuePanel_queuePanel.js.html index 25475d3..d9bfe08 100644 --- a/www/doc/client/panels_queuePanel_queuePanel.js.html +++ b/www/doc/client/panels_queuePanel_queuePanel.js.html @@ -1679,7 +1679,7 @@ class clearPopup{
diff --git a/www/doc/client/panels_settingsPanel.js.html b/www/doc/client/panels_settingsPanel.js.html index 0d8b2df..74b8727 100644 --- a/www/doc/client/panels_settingsPanel.js.html +++ b/www/doc/client/panels_settingsPanel.js.html @@ -103,7 +103,7 @@ class settingsPanel extends panelObj{
diff --git a/www/doc/client/player.html b/www/doc/client/player.html index 484e817..efdac7f 100644 --- a/www/doc/client/player.html +++ b/www/doc/client/player.html @@ -3374,7 +3374,7 @@ Might seem weird to keep this here instead of the HLS handler, but remember we m
diff --git a/www/doc/client/player.js.html b/www/doc/client/player.js.html index 209e834..3de47cd 100644 --- a/www/doc/client/player.js.html +++ b/www/doc/client/player.js.html @@ -474,7 +474,7 @@ class player{
diff --git a/www/doc/client/playlistManager.html b/www/doc/client/playlistManager.html index d57f75b..0bc1b4d 100644 --- a/www/doc/client/playlistManager.html +++ b/www/doc/client/playlistManager.html @@ -3631,7 +3631,7 @@
diff --git a/www/doc/client/poppedPanel.html b/www/doc/client/poppedPanel.html index 8fce52e..4305c59 100644 --- a/www/doc/client/poppedPanel.html +++ b/www/doc/client/poppedPanel.html @@ -1442,7 +1442,7 @@
diff --git a/www/doc/client/queuePanel.html b/www/doc/client/queuePanel.html index 6af4a55..2347fd2 100644 --- a/www/doc/client/queuePanel.html +++ b/www/doc/client/queuePanel.html @@ -5313,7 +5313,7 @@
diff --git a/www/doc/client/rawFileBase.html b/www/doc/client/rawFileBase.html index 19cc67e..e0feed8 100644 --- a/www/doc/client/rawFileBase.html +++ b/www/doc/client/rawFileBase.html @@ -2914,7 +2914,7 @@
diff --git a/www/doc/client/rawFileHandler.html b/www/doc/client/rawFileHandler.html index 374ea2c..cca00c9 100644 --- a/www/doc/client/rawFileHandler.html +++ b/www/doc/client/rawFileHandler.html @@ -2896,7 +2896,7 @@
diff --git a/www/doc/client/renamePopup.html b/www/doc/client/renamePopup.html index 23f1dc4..83e29b5 100644 --- a/www/doc/client/renamePopup.html +++ b/www/doc/client/renamePopup.html @@ -875,7 +875,7 @@
diff --git a/www/doc/client/reschedulePopup.html b/www/doc/client/reschedulePopup.html index 485b22a..cca142d 100644 --- a/www/doc/client/reschedulePopup.html +++ b/www/doc/client/reschedulePopup.html @@ -1050,7 +1050,7 @@
diff --git a/www/doc/client/schedulePopup.html b/www/doc/client/schedulePopup.html index da59dcd..8255821 100644 --- a/www/doc/client/schedulePopup.html +++ b/www/doc/client/schedulePopup.html @@ -960,7 +960,7 @@
diff --git a/www/doc/client/settingsPanel.html b/www/doc/client/settingsPanel.html index 382b6bb..7890d02 100644 --- a/www/doc/client/settingsPanel.html +++ b/www/doc/client/settingsPanel.html @@ -1156,7 +1156,7 @@
diff --git a/www/doc/client/userList.html b/www/doc/client/userList.html index cf2fe33..1d1ecca 100644 --- a/www/doc/client/userList.html +++ b/www/doc/client/userList.html @@ -1191,7 +1191,7 @@
diff --git a/www/doc/client/userlist.js.html b/www/doc/client/userlist.js.html index bbc7b8b..0234aa8 100644 --- a/www/doc/client/userlist.js.html +++ b/www/doc/client/userlist.js.html @@ -252,7 +252,7 @@ class userList{
diff --git a/www/doc/client/youtubeEmbedHandler.html b/www/doc/client/youtubeEmbedHandler.html index 0c650ab..dc4981e 100644 --- a/www/doc/client/youtubeEmbedHandler.html +++ b/www/doc/client/youtubeEmbedHandler.html @@ -2891,7 +2891,7 @@
diff --git a/www/doc/server/activeChannel.html b/www/doc/server/activeChannel.html index 2bf65ea..dc170a0 100644 --- a/www/doc/server/activeChannel.html +++ b/www/doc/server/activeChannel.html @@ -1218,13 +1218,13 @@
diff --git a/www/doc/server/app_channel_activeChannel.js.html b/www/doc/server/app_channel_activeChannel.js.html index 41a447d..5054c52 100644 --- a/www/doc/server/app_channel_activeChannel.js.html +++ b/www/doc/server/app_channel_activeChannel.js.html @@ -88,7 +88,7 @@ class activeChannel{ /** * Child Playlist Handler Object */ - this.playlistHandler = new playlistHandler(server, this); + this.playlistHandler = new playlistHandler(server, chanDB, this); /** * Child Chat Buffer Object @@ -215,13 +215,13 @@ module.exports = activeChannel;
diff --git a/www/doc/server/app_channel_channelManager.js.html b/www/doc/server/app_channel_channelManager.js.html index f6d45d2..21502ba 100644 --- a/www/doc/server/app_channel_channelManager.js.html +++ b/www/doc/server/app_channel_channelManager.js.html @@ -346,13 +346,13 @@ module.exports = channelManager;
diff --git a/www/doc/server/app_channel_chat.js.html b/www/doc/server/app_channel_chat.js.html index 2f4247b..0b0e21b 100644 --- a/www/doc/server/app_channel_chat.js.html +++ b/www/doc/server/app_channel_chat.js.html @@ -98,13 +98,13 @@ module.exports = chat;
diff --git a/www/doc/server/app_channel_chatBuffer.js.html b/www/doc/server/app_channel_chatBuffer.js.html index b0fc95a..df11724 100644 --- a/www/doc/server/app_channel_chatBuffer.js.html +++ b/www/doc/server/app_channel_chatBuffer.js.html @@ -194,13 +194,13 @@ module.exports = chatBuffer;
diff --git a/www/doc/server/app_channel_chatHandler.js.html b/www/doc/server/app_channel_chatHandler.js.html index 4f148df..56a8b8a 100644 --- a/www/doc/server/app_channel_chatHandler.js.html +++ b/www/doc/server/app_channel_chatHandler.js.html @@ -378,13 +378,13 @@ module.exports = chatHandler;
diff --git a/www/doc/server/app_channel_commandPreprocessor.js.html b/www/doc/server/app_channel_commandPreprocessor.js.html index 3c71341..39c90f2 100644 --- a/www/doc/server/app_channel_commandPreprocessor.js.html +++ b/www/doc/server/app_channel_commandPreprocessor.js.html @@ -482,13 +482,13 @@ module.exports = commandPreprocessor;
diff --git a/www/doc/server/app_channel_connectedUser.js.html b/www/doc/server/app_channel_connectedUser.js.html index 99ed2cb..f61df5d 100644 --- a/www/doc/server/app_channel_connectedUser.js.html +++ b/www/doc/server/app_channel_connectedUser.js.html @@ -360,13 +360,13 @@ module.exports = connectedUser;
diff --git a/www/doc/server/app_channel_media_media.js.html b/www/doc/server/app_channel_media_media.js.html index a240911..77f92ca 100644 --- a/www/doc/server/app_channel_media_media.js.html +++ b/www/doc/server/app_channel_media_media.js.html @@ -104,13 +104,13 @@ module.exports = media;
diff --git a/www/doc/server/app_channel_media_playlistHandler.js.html b/www/doc/server/app_channel_media_playlistHandler.js.html index 1baecc9..1e5d0c5 100644 --- a/www/doc/server/app_channel_media_playlistHandler.js.html +++ b/www/doc/server/app_channel_media_playlistHandler.js.html @@ -191,8 +191,6 @@ class playlistHandler{ } //The UUID is only validated, not processed so we just return the new time :P - console.log(this.channel) - console.log(this.channel.queue); return this.channel.queue.getStart(data.start) } @@ -1181,13 +1179,13 @@ module.exports = playlistHandler;
diff --git a/www/doc/server/app_channel_media_queue.js.html b/www/doc/server/app_channel_media_queue.js.html index 54971f7..b3c1e64 100644 --- a/www/doc/server/app_channel_media_queue.js.html +++ b/www/doc/server/app_channel_media_queue.js.html @@ -1818,13 +1818,13 @@ module.exports = queue;
diff --git a/www/doc/server/app_channel_media_queuedMedia.js.html b/www/doc/server/app_channel_media_queuedMedia.js.html index c1411cf..2574a84 100644 --- a/www/doc/server/app_channel_media_queuedMedia.js.html +++ b/www/doc/server/app_channel_media_queuedMedia.js.html @@ -174,13 +174,13 @@ module.exports = queuedMedia;
diff --git a/www/doc/server/app_channel_tokebot.js.html b/www/doc/server/app_channel_tokebot.js.html index 844cdd9..34f5dcf 100644 --- a/www/doc/server/app_channel_tokebot.js.html +++ b/www/doc/server/app_channel_tokebot.js.html @@ -293,13 +293,13 @@ module.exports = tokebot;
diff --git a/www/doc/server/channelManager.html b/www/doc/server/channelManager.html index 36d0fc7..76ffbba 100644 --- a/www/doc/server/channelManager.html +++ b/www/doc/server/channelManager.html @@ -2175,13 +2175,13 @@
diff --git a/www/doc/server/chat.html b/www/doc/server/chat.html index 8ad5a67..81d5896 100644 --- a/www/doc/server/chat.html +++ b/www/doc/server/chat.html @@ -699,13 +699,13 @@
diff --git a/www/doc/server/chatBuffer.html b/www/doc/server/chatBuffer.html index 371e83c..cec6f96 100644 --- a/www/doc/server/chatBuffer.html +++ b/www/doc/server/chatBuffer.html @@ -1323,13 +1323,13 @@ Left here since it seems like good form anywho, since this would be a private, o
diff --git a/www/doc/server/chatHandler.html b/www/doc/server/chatHandler.html index 93217bf..a5705fb 100644 --- a/www/doc/server/chatHandler.html +++ b/www/doc/server/chatHandler.html @@ -3870,13 +3870,13 @@
diff --git a/www/doc/server/commandPreprocessor.html b/www/doc/server/commandPreprocessor.html index 0dfed60..c2eb0f5 100644 --- a/www/doc/server/commandPreprocessor.html +++ b/www/doc/server/commandPreprocessor.html @@ -1492,13 +1492,13 @@ These arrays are used to handle further command/chat processing
diff --git a/www/doc/server/commandProcessor.html b/www/doc/server/commandProcessor.html index adce35c..d44d232 100644 --- a/www/doc/server/commandProcessor.html +++ b/www/doc/server/commandProcessor.html @@ -1825,13 +1825,13 @@
diff --git a/www/doc/server/connectedUser.html b/www/doc/server/connectedUser.html index ad9588e..4482395 100644 --- a/www/doc/server/connectedUser.html +++ b/www/doc/server/connectedUser.html @@ -2435,13 +2435,13 @@ Having to crawl through these sockets is that. Because the other ways seem more
diff --git a/www/doc/server/global.html b/www/doc/server/global.html index 605dadc..e1a32c2 100644 --- a/www/doc/server/global.html +++ b/www/doc/server/global.html @@ -2218,577 +2218,6 @@ This is important, as reducing authentication endpoints reduces attack surface. - - - - - - -

consoleWarn(string)

- - - - - - -
- Prints warning text to server console -
- - - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
string - - -String - - - - String to print to console
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -

errorHandler(res, msg, type, status) → {Express.Response}

- - - - - - -
- Main error handling function -
- - - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
res - - -Express.Response - - - - Response being sent out to the client who caused the issue
msg - - -String - - - - Error message to send the client
type - - -String - - - - Error type to send back to the client
status - - -Number - - - - HTTP(s) Status Code to send back to the client
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - - - -
Returns:
- - -
- If we have a usable Express Response object, return it back after it's been cashed -
- - - -
-
- Type -
-
- -Express.Response - - -
-
- - - - - - - - - - - - - -

errorMiddleware(err, req, res, next)

- - - - - - -
- Basic error-handling middleware to ensure we're not dumping stack traces to the client, as that would be insecure -
- - - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
err - - -Error - - - - Error to handle
req - - -Express.Request - - - - Express Request
res - - -Express.Response - - - - Express Response
next - - -function - - - - Next function in the Express middleware chain (Not that it's getting called XP)
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - @@ -2957,350 +2386,6 @@ https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects -

exceptionHandler(res, err)

- - - - - - -
- Handles exceptions which where directly the fault of user action >:( -
- - - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
res - - -Express.Response - - - - Express Response object to bitch at
err - - -Error - - - - Error created by the jerk in question
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -

exceptionSmith(msg, type) → {Error}

- - - - - - -
- Creates and returns a custom exception, tagged as a 'custom' exception, using the 'custom' boolean property. -This is used to denote that this error was generated on purpose, with a human readable message, that can be securely sent to the client. -Unexpected exceptions should only be logged internally, however, as they may contain sensitive data. -
- - - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
msg - - -String - - - - Error message to send the client
type - - -String - - - - Error type to send back to the client
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - - - -
Returns:
- - -
- The exception to smith -
- - - -
-
- Type -
-
- -Error - - -
-
- - - - - - - - - - - - -

fetchMetadata(fullID, title) → {Array}

@@ -5095,143 +4180,6 @@ Provides a basic level of privacy by only logging salted hashes of IP's - - - - - - -

localExceptionHandler(err)

- - - - - - -
- Handles local exceptions which where not directly created by user interaction -
- - - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
err - - -Error - - - - Exception to handle
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - @@ -6228,575 +5176,6 @@ Warns server admin against unsafe config options. - - - - - - -

socketCriticalExceptionHandler(socket, err) → {Boolean}

- - - - - - -
- Generates error messages and drops connection for critical errors caused by socket.io interaction -
- - - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
socket - - -Socket - - - - Socket error originated from
err - - -Error - - - - Error created by the jerk in question
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - - - -
Returns:
- - -
- - Passthrough from socket.disconnect -
- - - -
-
- Type -
-
- -Boolean - - -
-
- - - - - - - - - - - - - -

socketErrorHandler(socket, msg, type) → {Boolean}

- - - - - - -
- Basic error-handling for socket.io so we don't just silently swallow errors. -
- - - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
socket - - -Socket - - - - Socket error originated from
msg - - -String - - - - Error message to send the client
type - - -String - - - - Error type to send back to the client
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - - - -
Returns:
- - -
- - Passthrough from socket.emit -
- - - -
-
- Type -
-
- -Boolean - - -
-
- - - - - - - - - - - - - -

socketExceptionHandler(socket, err) → {Boolean}

- - - - - - -
- Generates error messages for simple errors generated by socket.io interaction -
- - - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
socket - - -Socket - - - - Socket error originated from
err - - -Error - - - - Error created by the jerk in question
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - - - -
Returns:
- - -
- - Passthrough from socket.emit -
- - - -
-
- Type -
-
- -Boolean - - -
-
- - - - - - - @@ -7371,13 +5750,13 @@ Warns server admin against unsafe config options.
diff --git a/www/doc/server/index.html b/www/doc/server/index.html index c03a523..78830f0 100644 --- a/www/doc/server/index.html +++ b/www/doc/server/index.html @@ -81,13 +81,13 @@ This new codebase intends to solve the following issues with the current CyTube
diff --git a/www/doc/server/media.html b/www/doc/server/media.html index 719a0ef..6ae18e4 100644 --- a/www/doc/server/media.html +++ b/www/doc/server/media.html @@ -784,13 +784,13 @@
diff --git a/www/doc/server/playlistHandler.html b/www/doc/server/playlistHandler.html index 955097a..ffebf64 100644 --- a/www/doc/server/playlistHandler.html +++ b/www/doc/server/playlistHandler.html @@ -500,7 +500,7 @@
Source:
@@ -865,7 +865,7 @@
Source:
@@ -1048,7 +1048,7 @@
Source:
@@ -1231,7 +1231,7 @@
Source:
@@ -1368,7 +1368,7 @@
Source:
@@ -1573,7 +1573,7 @@
Source:
@@ -1938,7 +1938,7 @@
Source:
@@ -2258,7 +2258,7 @@
Source:
@@ -2441,7 +2441,7 @@
Source:
@@ -2601,7 +2601,7 @@
Source:
@@ -2784,7 +2784,7 @@
Source:
@@ -2967,7 +2967,7 @@
Source:
@@ -3127,7 +3127,7 @@
Source:
@@ -3287,7 +3287,7 @@
Source:
@@ -3470,7 +3470,7 @@
Source:
@@ -3653,7 +3653,7 @@
Source:
@@ -4041,7 +4041,7 @@
Source:
@@ -4224,7 +4224,7 @@
Source:
@@ -4430,7 +4430,7 @@
Source:
@@ -4636,7 +4636,7 @@
Source:
@@ -4819,7 +4819,7 @@
Source:
@@ -4979,7 +4979,7 @@
Source:
@@ -5184,7 +5184,7 @@
Source:
@@ -5230,13 +5230,13 @@
diff --git a/www/doc/server/queue.html b/www/doc/server/queue.html index 937f0d1..ea579b9 100644 --- a/www/doc/server/queue.html +++ b/www/doc/server/queue.html @@ -6671,13 +6671,13 @@ Called auto-magically by the Synchronization Timer
diff --git a/www/doc/server/queuedMedia.html b/www/doc/server/queuedMedia.html index 6dcf218..1216275 100644 --- a/www/doc/server/queuedMedia.html +++ b/www/doc/server/queuedMedia.html @@ -1713,13 +1713,13 @@
diff --git a/www/doc/server/schemas_channel_channelBanSchema.js.html b/www/doc/server/schemas_channel_channelBanSchema.js.html index 7f94c42..cf51fc8 100644 --- a/www/doc/server/schemas_channel_channelBanSchema.js.html +++ b/www/doc/server/schemas_channel_channelBanSchema.js.html @@ -95,13 +95,13 @@ module.exports = channelBanSchema;
diff --git a/www/doc/server/schemas_channel_channelPermissionSchema.js.html b/www/doc/server/schemas_channel_channelPermissionSchema.js.html index 2a2ccde..ec2d7b6 100644 --- a/www/doc/server/schemas_channel_channelPermissionSchema.js.html +++ b/www/doc/server/schemas_channel_channelPermissionSchema.js.html @@ -163,13 +163,13 @@ module.exports = channelPermissionSchema;
diff --git a/www/doc/server/schemas_channel_channelSchema.js.html b/www/doc/server/schemas_channel_channelSchema.js.html index 3e7466c..35d0a91 100644 --- a/www/doc/server/schemas_channel_channelSchema.js.html +++ b/www/doc/server/schemas_channel_channelSchema.js.html @@ -928,13 +928,13 @@ module.exports = mongoose.model("channel", channelSchema);
diff --git a/www/doc/server/schemas_channel_chatSchema.js.html b/www/doc/server/schemas_channel_chatSchema.js.html index 3251a3b..e60700a 100644 --- a/www/doc/server/schemas_channel_chatSchema.js.html +++ b/www/doc/server/schemas_channel_chatSchema.js.html @@ -90,13 +90,13 @@ module.exports = chatSchema;
diff --git a/www/doc/server/schemas_channel_media_mediaSchema.js.html b/www/doc/server/schemas_channel_media_mediaSchema.js.html index 24d9936..aebddd9 100644 --- a/www/doc/server/schemas_channel_media_mediaSchema.js.html +++ b/www/doc/server/schemas_channel_media_mediaSchema.js.html @@ -90,13 +90,13 @@ module.exports = mediaSchema;
diff --git a/www/doc/server/schemas_channel_media_playlistMediaSchema.js.html b/www/doc/server/schemas_channel_media_playlistMediaSchema.js.html index 044e188..960fdbe 100644 --- a/www/doc/server/schemas_channel_media_playlistMediaSchema.js.html +++ b/www/doc/server/schemas_channel_media_playlistMediaSchema.js.html @@ -118,13 +118,13 @@ module.exports = mediaSchema.discriminator('saved', playlistMediaProperties);
diff --git a/www/doc/server/schemas_channel_media_playlistSchema.js.html b/www/doc/server/schemas_channel_media_playlistSchema.js.html index 7cf83c3..0947ca1 100644 --- a/www/doc/server/schemas_channel_media_playlistSchema.js.html +++ b/www/doc/server/schemas_channel_media_playlistSchema.js.html @@ -168,13 +168,13 @@ module.exports = playlistSchema;
diff --git a/www/doc/server/schemas_channel_media_queuedMediaSchema.js.html b/www/doc/server/schemas_channel_media_queuedMediaSchema.js.html index 5274632..52e8741 100644 --- a/www/doc/server/schemas_channel_media_queuedMediaSchema.js.html +++ b/www/doc/server/schemas_channel_media_queuedMediaSchema.js.html @@ -107,13 +107,13 @@ module.exports = mediaSchema.discriminator('queued', queuedProperties);
diff --git a/www/doc/server/schemas_emoteSchema.js.html b/www/doc/server/schemas_emoteSchema.js.html index d72246b..08ae363 100644 --- a/www/doc/server/schemas_emoteSchema.js.html +++ b/www/doc/server/schemas_emoteSchema.js.html @@ -158,13 +158,13 @@ module.exports = mongoose.model("emote", emoteSchema);
diff --git a/www/doc/server/schemas_flairSchema.js.html b/www/doc/server/schemas_flairSchema.js.html index 8dad54e..6add2c3 100644 --- a/www/doc/server/schemas_flairSchema.js.html +++ b/www/doc/server/schemas_flairSchema.js.html @@ -112,13 +112,13 @@ module.exports = mongoose.model("flair", flairSchema);
diff --git a/www/doc/server/schemas_permissionSchema.js.html b/www/doc/server/schemas_permissionSchema.js.html index a31b409..d368671 100644 --- a/www/doc/server/schemas_permissionSchema.js.html +++ b/www/doc/server/schemas_permissionSchema.js.html @@ -350,13 +350,13 @@ module.exports = mongoose.model("permissions", permissionSchema);
diff --git a/www/doc/server/schemas_statSchema.js.html b/www/doc/server/schemas_statSchema.js.html index 03c3ccc..37ce9f9 100644 --- a/www/doc/server/schemas_statSchema.js.html +++ b/www/doc/server/schemas_statSchema.js.html @@ -234,13 +234,13 @@ module.exports = mongoose.model("statistics", statSchema);
diff --git a/www/doc/server/schemas_tokebot_tokeCommandSchema.js.html b/www/doc/server/schemas_tokebot_tokeCommandSchema.js.html index d38cdc0..6ff9741 100644 --- a/www/doc/server/schemas_tokebot_tokeCommandSchema.js.html +++ b/www/doc/server/schemas_tokebot_tokeCommandSchema.js.html @@ -154,13 +154,13 @@ module.exports = mongoose.model("tokeCommand", tokeCommandSchema);
diff --git a/www/doc/server/schemas_user_emailChangeSchema.js.html b/www/doc/server/schemas_user_emailChangeSchema.js.html index 2ddc950..f4b10e2 100644 --- a/www/doc/server/schemas_user_emailChangeSchema.js.html +++ b/www/doc/server/schemas_user_emailChangeSchema.js.html @@ -216,13 +216,13 @@ module.exports = mongoose.model("emailChange", emailChangeSchema);
diff --git a/www/doc/server/schemas_user_passwordResetSchema.js.html b/www/doc/server/schemas_user_passwordResetSchema.js.html index b8f12a3..482a004 100644 --- a/www/doc/server/schemas_user_passwordResetSchema.js.html +++ b/www/doc/server/schemas_user_passwordResetSchema.js.html @@ -100,6 +100,12 @@ passwordResetSchema.pre('save', async function (next){ this.ipHash = hashUtil.hashIP(this.ipHash); } + //If the user was modified (usually only on document initialization) + if(this.isModified('user')){ + //Delete previous requests for the given user + const requests = await this.model().deleteMany({user: this.user._id}); + } + next(); }); @@ -192,13 +198,13 @@ module.exports = mongoose.model("passwordReset", passwordResetSchema);
diff --git a/www/doc/server/schemas_user_userBanSchema.js.html b/www/doc/server/schemas_user_userBanSchema.js.html index 1a040f3..7b8e6b5 100644 --- a/www/doc/server/schemas_user_userBanSchema.js.html +++ b/www/doc/server/schemas_user_userBanSchema.js.html @@ -515,13 +515,13 @@ module.exports = mongoose.model("userBan", userBanSchema);
diff --git a/www/doc/server/schemas_user_userSchema.js.html b/www/doc/server/schemas_user_userSchema.js.html index e4aa855..4faa7bf 100644 --- a/www/doc/server/schemas_user_userSchema.js.html +++ b/www/doc/server/schemas_user_userSchema.js.html @@ -882,13 +882,13 @@ module.exports.userModel = mongoose.model("user", userSchema);
diff --git a/www/doc/server/tokebot.html b/www/doc/server/tokebot.html index 8c1eddd..bc50283 100644 --- a/www/doc/server/tokebot.html +++ b/www/doc/server/tokebot.html @@ -1397,13 +1397,13 @@ I would now, but I don't want to break shit in a comment-only commit.
diff --git a/www/doc/server/utils_altchaUtils.js.html b/www/doc/server/utils_altchaUtils.js.html index 502f47b..50a509d 100644 --- a/www/doc/server/utils_altchaUtils.js.html +++ b/www/doc/server/utils_altchaUtils.js.html @@ -112,13 +112,13 @@ module.exports.verify = async function(payload, uniqueSecret = ''){
diff --git a/www/doc/server/utils_configCheck.js.html b/www/doc/server/utils_configCheck.js.html index 5c422ae..31a96d4 100644 --- a/www/doc/server/utils_configCheck.js.html +++ b/www/doc/server/utils_configCheck.js.html @@ -102,13 +102,13 @@ module.exports.securityCheck = function(){
diff --git a/www/doc/server/utils_hashUtils.js.html b/www/doc/server/utils_hashUtils.js.html index b322f7f..f683cb3 100644 --- a/www/doc/server/utils_hashUtils.js.html +++ b/www/doc/server/utils_hashUtils.js.html @@ -97,13 +97,13 @@ module.exports.hashIP = function(ip){
diff --git a/www/doc/server/utils_linkUtils.js.html b/www/doc/server/utils_linkUtils.js.html index ee6aaed..021b1a9 100644 --- a/www/doc/server/utils_linkUtils.js.html +++ b/www/doc/server/utils_linkUtils.js.html @@ -140,13 +140,13 @@ module.exports.markLink = async function(link){
diff --git a/www/doc/server/utils_loggerUtils.js.html b/www/doc/server/utils_loggerUtils.js.html index d6b116f..a818d99 100644 --- a/www/doc/server/utils_loggerUtils.js.html +++ b/www/doc/server/utils_loggerUtils.js.html @@ -42,6 +42,9 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.*/ +//Node Imports +const fs = require('node:fs/promises') + //Config const config = require('../../config.json'); @@ -92,7 +95,7 @@ module.exports.localExceptionHandler = function(err){ //If we're being verbose if(config.verbose){ //Log the error - console.log(err) + module.exports.dumpError(err); } } @@ -191,6 +194,17 @@ module.exports.errorMiddleware = function(err, req, res, next){ } module.exports.errorHandler(res, err.message, reason, err.status); +} + +module.exports.dumpError = function(err, date = new Date()){ + try{ + console.log(err); + console.log(JSON.stringify(err, null, 2)); + fs.writeFile(`log/crash/${date.getTime()}.log`, JSON.stringify(err, null, 2)); + }catch(err){ + module.exports.consoleWarn("Hey Dawg, I Heard you liked errors, so I got you an error while dumping your error to the error logs:"); + module.exports.consoleWarn(err); + } } @@ -207,7 +221,7 @@ module.exports.errorMiddleware = function(err, req, res, next){
diff --git a/www/doc/server/utils_mailUtils.js.html b/www/doc/server/utils_mailUtils.js.html index 0ad5f5c..f73cd30 100644 --- a/www/doc/server/utils_mailUtils.js.html +++ b/www/doc/server/utils_mailUtils.js.html @@ -134,13 +134,13 @@ module.exports.sendAddressVerification = async function(requestDB, userDB, newEm
diff --git a/www/doc/server/utils_media_internetArchiveUtils.js.html b/www/doc/server/utils_media_internetArchiveUtils.js.html index 060afb1..063a1e0 100644 --- a/www/doc/server/utils_media_internetArchiveUtils.js.html +++ b/www/doc/server/utils_media_internetArchiveUtils.js.html @@ -57,7 +57,6 @@ const loggerUtils = require('../loggerUtils.js') * @returns {Array} Generated list of media objects from given upload path */ module.exports.fetchMetadata = async function(fullID, title){ - console.log("FUCK"); //Split fullID by first slash const [itemID, requestedPath] = decodeURIComponent(fullID).split(/\/(.*)/); //Create empty list to hold media objects @@ -127,8 +126,6 @@ module.exports.fetchMetadata = async function(fullID, title){ } } - console.log(mediaList); - //return media object list return mediaList; @@ -151,13 +148,13 @@ module.exports.fetchMetadata = async function(fullID, title){
diff --git a/www/doc/server/utils_media_yanker.js.html b/www/doc/server/utils_media_yanker.js.html index 5815fa4..68bd14e 100644 --- a/www/doc/server/utils_media_yanker.js.html +++ b/www/doc/server/utils_media_yanker.js.html @@ -187,13 +187,13 @@ module.exports.getMediaType = async function(url){
diff --git a/www/doc/server/utils_media_ytdlpUtils.js.html b/www/doc/server/utils_media_ytdlpUtils.js.html index a36a65a..e7a2e2b 100644 --- a/www/doc/server/utils_media_ytdlpUtils.js.html +++ b/www/doc/server/utils_media_ytdlpUtils.js.html @@ -180,13 +180,13 @@ async function ytdlpFetch(link, format = 'b'){
diff --git a/www/doc/server/utils_regexUtils.js.html b/www/doc/server/utils_regexUtils.js.html index 60a8f6d..bd5e072 100644 --- a/www/doc/server/utils_regexUtils.js.html +++ b/www/doc/server/utils_regexUtils.js.html @@ -63,13 +63,13 @@ module.exports.escapeRegex = function(string){
diff --git a/www/doc/server/utils_scheduler.js.html b/www/doc/server/utils_scheduler.js.html index 2f67d9f..2a53346 100644 --- a/www/doc/server/utils_scheduler.js.html +++ b/www/doc/server/utils_scheduler.js.html @@ -99,13 +99,13 @@ module.exports.kickoff = function(){
diff --git a/www/doc/server/utils_sessionUtils.js.html b/www/doc/server/utils_sessionUtils.js.html index 5eb7e6e..40a5087 100644 --- a/www/doc/server/utils_sessionUtils.js.html +++ b/www/doc/server/utils_sessionUtils.js.html @@ -230,13 +230,13 @@ module.exports.maxAttempts = maxAttempts;