Update dependency typescript to v5.3.3

# Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

- Update the renovate config so that the bot will add the `type/dependencies` label to the PRs

#55

## Type of change

Please delete options that are not relevant.

- [x] New feature (non-breaking change which adds functionality)

# How Has This Been Tested?

Please describe the tests that you ran to verify the changes. Provide instructions so we can reproduce. Please also list any relevant details to your test configuration.

# Checklist

- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that provde my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream modules

Reviewed-on: https://gitea.vylpes.xyz/External/card-drop/pulls/128
Reviewed-by: VylpesTester <tester@vylpes.com>
Co-authored-by: Ethan Lane <ethan@vylpes.com>
Co-committed-by: Ethan Lane <ethan@vylpes.com>

.dev.env

@@ -16,6 +16,8 @@ BOT_ENV=4
 ABOUT_FUNDING=
 ABOUT_REPO=
 
+DATA_DIR=
+
 DB_HOST=127.0.0.1
 DB_PORT=3301
 DB_NAME=carddrop

.drone.yml

@@ -4,16 +4,36 @@ kind: pipeline
 name: deployment
 
 steps:
-- name: deploy
-  image: appleboy/drone-ssh
+- name: build
+  image: node
+  commands:
+  - npm ci
+  - npm run build
+- name: test
+  image: node
+  commands:
+  - npm test
+- name: deploy to prod
+  image: drillster/drone-rsync
+  secrets: [ ssh_key, bot_token_prod ]
   settings:
-    host: 192.168.68.120
-    username: vylpes
-    password:
-      from_secret: ssh_password
-    port: 22
+    hosts:
+      - 192.168.68.120
+    user: vylpes
+    key:
+      from_secret: ssh_key
+    source: .
+    target: ~/apps/card-drop/card-drop_prod
+    recursive: true
     script:
-      - sh /home/vylpes/scripts/card-drop/deploy_prod.sh
+      - export PATH="$HOME/.yarn/bin:$PATH"
+      - export PATH="$HOME/.nodeuse/bin:$PATH"
+      - export BOT_TOKEN="$BOT_TOKEN_PROD"
+      - cd ~/apps/card-drop/card-drop_prod
+      - docker compose --file docker-compose.prod.yml up -d
+      - sleep 10
+      - cp .prod.env .env
+      - pm2 restart card-drop_prod || pm2 start --name card-drop_prod dist/bot.js
 
 trigger:
   event:
@@ -25,16 +45,36 @@ kind: pipeline
 name: staging
 
 steps:
-- name: stage
-  image: appleboy/drone-ssh
+- name: build
+  image: node
+  commands:
+  - npm ci
+  - npm run build
+- name: test
+  image: node
+  commands:
+  - npm test
+- name: deploy to stage
+  image: drillster/drone-rsync
+  secrets: [ ssh_key, bot_token_stage ]
   settings:
-    host: 192.168.68.120
-    username: vylpes
-    password:
-      from_secret: ssh_password
-    port: 22
+    hosts:
+      - 192.168.68.120
+    user: vylpes
+    key:
+      from_secret: ssh_key
+    source: .
+    target: ~/apps/card-drop/card-drop_stage
+    recursive: true
     script:
-      - sh /home/vylpes/scripts/card-drop/deploy_stage.sh
+      - export PATH="$HOME/.yarn/bin:$PATH"
+      - export PATH="$HOME/.nodeuse/bin:$PATH"
+      - export BOT_TOKEN="$BOT_TOKEN_STAGE"
+      - cd ~/apps/card-drop/card-drop_stage
+      - docker compose --file docker-compose.stage.yml up -d
+      - sleep 10
+      - cp .stage.env .env
+      - pm2 restart card-drop_stage || pm2 start --name card-drop_stage dist/bot.js
 
 trigger:
   branch:
@@ -53,17 +93,13 @@ steps:
   commands:
   - npm ci
   - npm run build
-
 - name: test
   image: node
   commands:
-  - npm ci
   - npm test
 
 trigger:
   branch:
-  - main
-  - develop
   - hotfix/*
   - feature/*
   - renovate/*

.prod.env

@@ -16,6 +16,8 @@ BOT_ENV=1
 ABOUT_FUNDING=
 ABOUT_REPO=
 
+DATA_DIR=/home/vylpes/appdata/card-drop/card-drop_prod
+
 DB_HOST=127.0.0.1
 DB_PORT=3321
 DB_NAME=carddrop

.stage.env

@@ -16,6 +16,8 @@ BOT_ENV=2
 ABOUT_FUNDING=
 ABOUT_REPO=
 
+DATA_DIR=/home/vylpes/appdata/card-drop/card-drop_stage
+
 DB_HOST=127.0.0.1
 DB_PORT=3311
 DB_NAME=carddrop

package.json

@@ -40,11 +40,10 @@
     "typeorm": "0.3.17"
   },
   "resolutions": {
-    "**/undici": "^5.26.2"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
-    "np": "^8.0.4",
+    "np": "^9.0.0",
     "typescript": "^5.0.0"
   }
 }

renovate.json

@@ -1,4 +1,5 @@
 {
     "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-    "baseBranches": ["develop"]
+    "baseBranches": ["develop"],
+    "labels": ["type/dependencies"]
   }

src/Functions/CardMetadataFunction.ts

@@ -26,7 +26,7 @@ export default class CardMetadataFunction {
     private static async FindMetadataJSONs(): Promise<SeriesMetadata[]> {
         const res: SeriesMetadata[] = [];
 
-        const seriesJSONs = await glob(path.join(process.cwd(), 'cards', '/**/*.json'));
+        const seriesJSONs = await glob(path.join(process.env.DATA_DIR!, 'cards', '/**/*.json'));
 
         for (let jsonPath of seriesJSONs) {
             console.log(`Reading file ${jsonPath}`);

src/bot.ts

@@ -14,6 +14,7 @@ const requiredConfigs: string[] = [
     "BOT_OWNERID",
     "BOT_CLIENTID",
     "BOT_ENV",
+    "DATA_DIR",
     "DB_HOST",
     "DB_PORT",
     "DB_AUTH_USER",
@@ -39,7 +40,7 @@ Registry.RegisterCommands();
 Registry.RegisterEvents();
 Registry.RegisterButtonEvents();
 
-if (!existsSync(`${process.cwd()}/cards`) && process.env.GDRIVESYNC_AUTO && process.env.GDRIVESYNC_AUTO == 'true') {
+if (!existsSync(`${process.env.DATA_DIR}/cards`) && process.env.GDRIVESYNC_AUTO && process.env.GDRIVESYNC_AUTO == 'true') {
     console.log("Card directory not found, syncing...");
 
     CoreClient.AllowDrops = false;

src/buttonEvents/Reroll.ts

@@ -31,7 +31,7 @@ export default class Reroll extends ButtonEvent {
             let image: Buffer;
             const imageFileName = randomCard.card.path.split("/").pop()!;
 
-            image = readFileSync(path.join(process.cwd(), 'cards', randomCard.card.path));
+            image = readFileSync(path.join(process.env.DATA_DIR!, 'cards', randomCard.card.path));
 
             await interaction.deferReply();
 

src/commands/drop.ts

@@ -39,7 +39,7 @@ export default class Drop extends Command {
             let image: Buffer;
             const imageFileName = randomCard.card.path.split("/").pop()!;
 
-            image = readFileSync(path.join(process.cwd(), 'cards', randomCard.card.path));
+            image = readFileSync(path.join(process.env.DATA_DIR!, 'cards', randomCard.card.path));
 
             await interaction.deferReply();
 

src/commands/gdrivesync.ts

@@ -29,7 +29,7 @@ export default class Gdrivesync extends Command {
 
         CoreClient.AllowDrops = false;
 
-        exec(`rclone sync card-drop-gdrive: ${process.cwd()}/cards`, async (error: ExecException | null) => {
+        exec(`rclone sync card-drop-gdrive: ${process.env.DATA_DIR}/cards`, async (error: ExecException | null) => {
             if (error) {
                 await interaction.editReply(`Error while running sync command. Safe Mode has been activated. Code: ${error.code}`);
                 await Config.SetValue('safemode', 'true');

src/commands/stage/dropnumber.ts

@@ -47,7 +47,7 @@ export default class Dropnumber extends Command {
         const imageFileName = card.path.split("/").pop()!;
 
         try {
-            image = readFileSync(path.join(process.cwd(), 'cards', card.path));
+            image = readFileSync(path.join(process.env.DATA_DIR!, 'cards', card.path));
         } catch {
             await interaction.reply(`Unable to fetch image for card ${card.id}`);
             return;

src/commands/stage/droprarity.ts

@@ -50,7 +50,7 @@ export default class Droprarity extends Command {
         const imageFileName = card.card.path.split("/").pop()!;
 
         try {
-            image = readFileSync(path.join(process.cwd(), 'cards', card.card.path));
+            image = readFileSync(path.join(process.env.DATA_DIR!, 'cards', card.card.path));
         } catch {
             await interaction.reply(`Unable to fetch image for card ${card.card.id}`);
             return;