Merge branch 'feature/broken_dependencies' into dependabot/npm_and_ya…

…rn/type-fest-4.26.1

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.9.5] - 2024-10-29
+- Dependency update
+- Pull request #1040 merged (Used incorrect PR number, apoligies)
+
 ## [2.9.4] - 2024-08-28
 
 ### Added 
@@ -344,7 +348,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial release
 
-[unreleased]: https://github.com/codetheweb/muse/compare/v2.9.4...HEAD
+[unreleased]: https://github.com/museofficial/muse/compare/v2.9.5...HEAD
+[2.9.5]: https://github.com/museofficial/muse/compare/v2.9.4...v2.9.5
 [2.9.4]: https://github.com/codetheweb/muse/compare/v2.9.3...v2.9.4
 [2.9.3]: https://github.com/codetheweb/muse/compare/v2.9.2...v2.9.3
 [2.9.2]: https://github.com/codetheweb/muse/compare/v2.9.1...v2.9.2

Dockerfile

@@ -52,5 +52,6 @@ ENV DATA_DIR=/data
 ENV NODE_ENV=production
 ENV COMMIT_HASH=$COMMIT_HASH
 ENV BUILD_DATE=$BUILD_DATE
+ENV ENV_FILE=/config
 
 CMD ["tini", "--", "node", "--enable-source-maps", "dist/scripts/migrate-and-start.js"]

README.md

@@ -63,6 +63,8 @@ docker run -it -v "$(pwd)/data":/data -e DISCORD_TOKEN='' -e SPOTIFY_CLIENT_ID='
 
 This starts Muse and creates a data directory in your current directory.
 
+You can also store your tokens in an environment file and make it available to your container. By default, the container will look for a `/config` environment file. You can customize this path with the `ENV_FILE` environment variable to use with, for example, [docker secrets](https://docs.docker.com/engine/swarm/secrets/). 
+
 **Docker Compose**:
 
 ```yaml

package.json

@@ -1,6 +1,6 @@
 {
   "name": "muse",
-  "version": "2.9.4",
+  "version": "2.9.5",
   "description": "🎧 a self-hosted Discord music bot that doesn't suck ",
   "repository": "git@github.com:museofficial/muse.git",
   "author": "Max Isom <hi@maxisom.me>",
@@ -36,12 +36,12 @@
     "@types/bluebird": "^3.5.35",
     "@types/debug": "^4.1.5",
     "@types/fluent-ffmpeg": "^2.1.17",
-    "@types/fs-capacitor": "^2.0.0",
-    "@types/ms": "0.7.31",
-    "@types/node": "^17.0.0",
+    "@types/fs-capacitor": "^8.0.2",
+    "@types/node": "^22.8.2",
+    "@types/ms": "0.7.34",
     "@types/node-emoji": "^1.8.1",
     "@types/spotify-web-api-node": "^5.0.2",
-    "@types/validator": "^13.1.4",
+    "@types/validator": "^13.12.2",
     "@types/ws": "8.5.4",
     "@typescript-eslint/eslint-plugin": "^4.31.1",
     "@typescript-eslint/parser": "^4.31.1",
@@ -50,10 +50,10 @@
     "eslint-config-xo-typescript": "^0.44.0",
     "eslint-plugin-import": "2.29.1",
     "husky": "^4.3.8",
-    "prisma": "4.16.0",
+    "prisma": "5.21.1",
     "release-it": "^14.11.8",
-    "type-fest": "^4.26.1",
-    "typescript": "^4.6.4"
+    "type-fest": "^2.12.0",
+    "typescript": "^5.6.3"
   },
   "eslintConfig": {
     "extends": [
@@ -96,26 +96,26 @@
     "array-shuffle": "^3.0.0",
     "debug": "^4.3.3",
     "delay": "^5.0.0",
-    "discord-api-types": "0.32.1",
+    "discord-api-types": "0.37.103",
     "discord.js": "14.11.0",
-    "dotenv": "^16.0.0",
-    "execa": "^6.1.0",
+    "dotenv": "^16.4.5",
+    "execa": "^9.5.1",
     "fluent-ffmpeg": "^2.1.2",
-    "fs-capacitor": "^7.0.1",
+    "fs-capacitor": "^8.0.0",
     "get-youtube-id": "^1.0.1",
     "got": "^12.0.2",
     "hasha": "^5.2.2",
     "inversify": "^6.0.1",
-    "iso8601-duration": "^1.3.0",
+    "iso8601-duration": "^2.1.2",
     "libsodium-wrappers": "^0.7.9",
     "make-dir": "^3.1.0",
     "node-emoji": "^1.10.0",
     "nodesplash": "^0.1.1",
-    "ora": "^6.1.0",
+    "ora": "^8.1.0",
     "p-event": "^5.0.1",
-    "p-limit": "^4.0.0",
+    "p-limit": "^6.1.0",
     "p-queue": "^7.2.0",
-    "p-retry": "4.6.2",
+    "p-retry": "6.2.0",
     "pagination.djs": "^4.0.10",
     "parse-duration": "1.0.2",
     "patch-package": "^8.0.0",

src/services/config.ts

@@ -5,7 +5,7 @@ import path from 'path';
 import xbytes from 'xbytes';
 import {ConditionalKeys} from 'type-fest';
 import {ActivityType, PresenceStatusData} from 'discord.js';
-dotenv.config();
+dotenv.config({path: process.env.ENV_FILE ?? path.resolve(process.cwd(), '.env')});
 
 export const DATA_DIR = path.resolve(process.env.DATA_DIR ? process.env.DATA_DIR : './data');