Bump packages

.gitignore

@@ -2,6 +2,7 @@ data
 .DS_Store
 dist
 dts
+.yarn
 
 # Logs
 logs

.yarnrc.yml

@@ -0,0 +1 @@
+yarnPath: ".yarn/releases/yarn-berry.js"

package.json

@@ -16,10 +16,10 @@
     "lint": "eslint 'src/**/*.ts'",
     "lint-fix": "eslint 'src/**/*.ts' --fix",
     "clean": "rm -rf dist dts",
-    "test": "npm run lint",
+    "test": "yarn lint",
     "build": "tsc",
     "watch": "tsc --watch",
-    "prepack": "npm run clean && npm run build",
+    "prepack": "yarn clean && yarn build",
     "start": "node dist/index.js",
     "dev": "nodemon",
     "docker-publish": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t codetheweb/muse:latest --push ."
@@ -27,23 +27,23 @@
   "devDependencies": {
     "@types/bluebird": "^3.5.32",
     "@types/debug": "^4.1.5",
-    "@types/fluent-ffmpeg": "^2.1.14",
+    "@types/fluent-ffmpeg": "^2.1.16",
     "@types/fs-capacitor": "^2.0.0",
-    "@types/node": "^14.6.0",
+    "@types/node": "^14.14.2",
     "@types/node-emoji": "^1.8.1",
     "@types/spotify-web-api-node": "^4.0.1",
     "@types/validator": "^13.1.0",
-    "@types/ws": "^7.2.6",
+    "@types/ws": "^7.2.7",
-    "@typescript-eslint/eslint-plugin": "^3.10.0",
+    "@typescript-eslint/eslint-plugin": "^4.5.0",
-    "@typescript-eslint/parser": "^3.10.0",
+    "@typescript-eslint/parser": "^4.5.0",
-    "eslint": "^7.7.0",
+    "eslint": "^7.12.0",
-    "eslint-config-xo": "^0.32.1",
+    "eslint-config-xo": "^0.33.1",
-    "eslint-config-xo-typescript": "^0.32.0",
+    "eslint-config-xo-typescript": "^0.35.0",
-    "husky": "^4.2.5",
+    "husky": "^4.3.0",
-    "nodemon": "^2.0.4",
+    "nodemon": "^2.0.6",
     "reflect-metadata": "^0.1.13",
     "ts-node": "^9.0.0",
-    "typescript": "^4.0.2"
+    "typescript": "^4.0.3"
   },
   "eslintConfig": {
     "extends": [
@@ -63,21 +63,21 @@
   },
   "husky": {
     "hooks": {
-      "pre-commit": "npm test && npm run build"
+      "pre-commit": "npm test && yarn build"
     }
   },
   "dependencies": {
     "@discordjs/opus": "^0.3.2",
     "array-shuffle": "^1.0.1",
-    "debug": "^4.1.1",
+    "debug": "^4.2.0",
     "delay": "^4.4.0",
-    "discord.js": "^12.3.1",
+    "discord.js": "^12.4.1",
     "dotenv": "^8.2.0",
     "fluent-ffmpeg": "^2.1.2",
     "fs-capacitor": "^6.2.0",
     "get-youtube-id": "^1.0.1",
-    "got": "^11.5.2",
+    "got": "^11.8.0",
-    "hasha": "^5.2.0",
+    "hasha": "^5.2.2",
     "inversify": "^5.0.1",
     "iso8601-duration": "^1.2.0",
     "make-dir": "^3.1.0",
@@ -86,11 +86,11 @@
     "sequelize": "^5.21.11",
     "sequelize-typescript": "^1.1.0",
     "spotify-uri": "^2.1.0",
-    "spotify-web-api-node": "^4.0.0",
+    "spotify-web-api-node": "^5.0.0",
     "sqlite3": "^5.0.0",
     "unique-random-array": "^2.0.0",
     "youtube.ts": "^0.1.8",
-    "ytdl-core": "^3.2.2",
+    "ytdl-core": "^3.4.2",
-    "ytsr": "^1.0.1"
+    "ytsr": "^1.0.4"
   }
 }

src/bot.ts

@@ -89,7 +89,7 @@ export default class {
         }
 
         await handler.execute(msg, args);
-      } catch (error) {
+      } catch (error: unknown) {
         debug(error);
         await msg.channel.send(errorMsg((error as Error).message.toLowerCase()));
       }

src/commands/fseek.ts

@@ -52,8 +52,8 @@ export default class implements Command {
       await player.forwardSeek(seekTime);
 
       await loading.stop();
-    } catch (error) {
+    } catch (error: unknown) {
-      await loading.stop(errorMsg(error));
+      await loading.stop(errorMsg(error as Error));
     }
   }
 }

src/commands/play.ts

@@ -2,8 +2,7 @@ import {TextChannel, Message} from 'discord.js';
 import {URL} from 'url';
 import {TYPES} from '../types';
 import {inject, injectable} from 'inversify';
-import {QueuedSong} from '../services/player';
+import {QueuedSong, STATUS} from '../services/player';
-import {STATUS} from '../services/player';
 import PlayerManager from '../managers/player';
 import {getMostPopularVoiceChannel} from '../utils/channels';
 import LoadingMessage from '../utils/loading-message';
@@ -111,7 +110,7 @@ export default class implements Command {
 
         newSongs.push(...convertedSongs);
       }
-    } catch (_) {
+    } catch (_: unknown) {
       // Not a URL, must search YouTube
       const query = args.join(' ');
 

src/commands/seek.ts

@@ -63,8 +63,8 @@ export default class implements Command {
       await player.seek(seekTime);
 
       await loading.stop();
-    } catch (error) {
+    } catch (error: unknown) {
-      await loading.stop(errorMsg(error));
+      await loading.stop(errorMsg(error as Error));
     }
   }
 }

src/commands/skip.ts

@@ -32,7 +32,7 @@ export default class implements Command {
       await player.forward();
 
       await loader.stop('keep \'er movin\'');
-    } catch (_) {
+    } catch (_: unknown) {
       await loader.stop(errorMsg('no song to skip to'));
     }
   }

src/commands/unskip.ts

@@ -28,7 +28,7 @@ export default class implements Command {
       await player.back();
 
       await msg.channel.send('back \'er up\'');
-    } catch (_) {
+    } catch (_: unknown) {
       await msg.channel.send(errorMsg('no song to go back to'));
     }
   }

src/services/get-songs.ts

@@ -29,7 +29,7 @@ export default class {
       const {items: [video]} = await this.youtube.videos.search({q: query, maxResults: 1, type: 'video'});
 
       return await this.youtubeVideo(video.id.videoId);
-    } catch (_) {
+    } catch (_: unknown) {
       return null;
     }
   }
@@ -46,7 +46,7 @@ export default class {
         playlist: null,
         isLive: videoDetails.snippet.liveBroadcastContent === 'live'
       };
-    } catch (_) {
+    } catch (_: unknown) {
       return null;
     }
   }
@@ -200,7 +200,7 @@ export default class {
         playlist,
         isLive: video.live
       };
-    } catch (_) {
+    } catch (_: unknown) {
       return null;
     }
   }

src/services/natural-language-commands.ts

@@ -84,7 +84,7 @@ export default class {
 
           resolve();
         }, duration * 1000);
-      } catch (error) {
+      } catch (error: unknown) {
         reject(error);
       }
     });

src/services/player.ts

@@ -141,7 +141,7 @@ export default class {
         this.startTrackingPosition(0);
         this.lastSongURL = currentSong.url;
       }
-    } catch (error) {
+    } catch (error: unknown) {
       this.removeCurrent();
       throw error;
     }
@@ -171,7 +171,7 @@ export default class {
         this.status = STATUS.PAUSED;
         this.disconnect();
       }
-    } catch (error) {
+    } catch (error: unknown) {
       this.queuePosition--;
       throw error;
     }
@@ -282,7 +282,7 @@ export default class {
       await fs.access(this.getCachedPath(url));
 
       return true;
-    } catch (_) {
+    } catch (_: unknown) {
       return false;
     }
   }
@@ -313,7 +313,7 @@ export default class {
       format = formats.find(filter);
 
       const nextBestFormat = (formats: ytdl.videoFormat[]): ytdl.videoFormat | undefined => {
-        if (formats[0].live) {
+        if (formats[0].isLive) {
           formats = formats.sort((a, b) => (b as unknown as {audioBitrate: number}).audioBitrate - (a as unknown as {audioBitrate: number}).audioBitrate); // Bad typings
 
           return formats.find(format => [128, 127, 120, 96, 95, 94, 93].includes(parseInt(format.itag as unknown as string, 10))); // Bad typings
@@ -321,7 +321,13 @@ export default class {
 
         formats = formats
           .filter(format => format.averageBitrate)
-          .sort((a, b) => b.averageBitrate - a.averageBitrate);
+          .sort((a, b) => {
+            if (a && b) {
+              return b.averageBitrate! - a.averageBitrate!;
+            }
+
+            return 0;
+          });
         return formats.find(format => !format.bitrate) ?? formats[0];
       };