merge?

package-lock.json

@@ -13,6 +13,7 @@
         "@types/node-fetch": "^2.6.11",
         "compression": "^1.7.4",
         "express": "^4.19.2",
+        "node-fetch": "^3.3.2",
         "ts-to-jsdoc": "^2.2.0"
       },
       "devDependencies": {
@@ -22,6 +23,8 @@
         "@stylistic/eslint-plugin": "^2.3.0",
         "@types/compression": "^1.7.5",
         "@types/eslint__js": "^8.42.3",
+        "@types/express": "^4.17.21",
+        "@types/node-fetch": "^2.6.11",
         "eslint": "^8.57.0",
         "eslint-plugin-html": "^8.1.1",
         "eslint-plugin-sonarjs": "^1.0.4",
@@ -610,6 +613,10 @@
       "version": "1.19.5",
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
       "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
+<<<<<<< HEAD
+=======
+      "dev": true,
+>>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e
       "license": "MIT",
       "dependencies": {
         "@types/connect": "*",
@@ -630,6 +637,10 @@
       "version": "3.4.38",
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
       "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
+<<<<<<< HEAD
+=======
+      "dev": true,
+>>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
@@ -664,6 +675,10 @@
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
       "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
+<<<<<<< HEAD
+=======
+      "dev": true,
+>>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e
       "license": "MIT",
       "dependencies": {
         "@types/body-parser": "*",
@@ -676,6 +691,10 @@
       "version": "4.19.5",
       "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz",
       "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==",
+<<<<<<< HEAD
+=======
+      "dev": true,
+>>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
@@ -688,6 +707,10 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
       "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
+<<<<<<< HEAD
+=======
+      "dev": true,
+>>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e
       "license": "MIT"
     },
     "node_modules/@types/json-schema": {
@@ -700,6 +723,10 @@
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
       "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
+<<<<<<< HEAD
+=======
+      "dev": true,
+>>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e
       "license": "MIT"
     },
     "node_modules/@types/node": {
@@ -715,6 +742,10 @@
       "version": "2.6.11",
       "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.11.tgz",
       "integrity": "sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==",
+<<<<<<< HEAD
+=======
+      "dev": true,
+>>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
@@ -731,18 +762,30 @@
       "version": "6.9.16",
       "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.16.tgz",
       "integrity": "sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A==",
+<<<<<<< HEAD
+=======
+      "dev": true,
+>>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e
       "license": "MIT"
     },
     "node_modules/@types/range-parser": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
       "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
+<<<<<<< HEAD
+=======
+      "dev": true,
+>>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e
       "license": "MIT"
     },
     "node_modules/@types/send": {
       "version": "0.17.4",
       "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
       "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
+<<<<<<< HEAD
+=======
+      "dev": true,
+>>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e
       "license": "MIT",
       "dependencies": {
         "@types/mime": "^1",
@@ -753,6 +796,10 @@
       "version": "1.15.7",
       "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
       "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
+<<<<<<< HEAD
+=======
+      "dev": true,
+>>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e
       "license": "MIT",
       "dependencies": {
         "@types/http-errors": "*",
@@ -1290,6 +1337,10 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+<<<<<<< HEAD
+=======
+      "dev": true,
+>>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e
       "license": "MIT"
     },
     "node_modules/b4a": {
@@ -1739,6 +1790,10 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+<<<<<<< HEAD
+=======
+      "dev": true,
+>>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e
       "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
@@ -1896,6 +1951,15 @@
         "node": ">= 8"
       }
     },
+    "node_modules/data-uri-to-buffer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
     "node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -1950,6 +2014,10 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+<<<<<<< HEAD
+=======
+      "dev": true,
+>>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e
       "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
@@ -2661,6 +2729,29 @@
         "reusify": "^1.0.4"
       }
     },
+    "node_modules/fetch-blob": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "node-domexception": "^1.0.0",
+        "web-streams-polyfill": "^3.0.3"
+      },
+      "engines": {
+        "node": "^12.20 || >= 14.13"
+      }
+    },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -2819,6 +2910,10 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
       "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+<<<<<<< HEAD
+=======
+      "dev": true,
+>>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
@@ -2829,6 +2924,21 @@
         "node": ">= 6"
       }
     },
+<<<<<<< HEAD
+=======
+    "node_modules/formdata-polyfill": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+      "license": "MIT",
+      "dependencies": {
+        "fetch-blob": "^3.1.2"
+      },
+      "engines": {
+        "node": ">=12.20.0"
+      }
+    },
+>>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e
     "node_modules/forwarded": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -4285,6 +4395,43 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/node-domexception": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "github",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.5.0"
+      }
+    },
+    "node_modules/node-fetch": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+      "license": "MIT",
+      "dependencies": {
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/node-fetch"
+      }
+    },
     "node_modules/node-releases": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
@@ -5885,6 +6032,13 @@
       "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
       "license": "MIT"
     },
+    "node_modules/unique-stream": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
+      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/unique-stream": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
@@ -6176,6 +6330,18 @@
         "node": ">=10.13.0"
       }
     },
+<<<<<<< HEAD
+=======
+    "node_modules/web-streams-polyfill": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
+      "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+>>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",

package.json

@@ -12,10 +12,9 @@
   "author": "MathMan05",
   "license": "GPL-3.0",
   "dependencies": {
-    "@types/express": "^4.17.21",
-    "@types/node-fetch": "^2.6.11",
     "compression": "^1.7.4",
     "express": "^4.19.2",
+    "node-fetch": "^3.3.2",
     "ts-to-jsdoc": "^2.2.0"
   },
   "devDependencies": {
@@ -25,6 +24,8 @@
     "@stylistic/eslint-plugin": "^2.3.0",
     "@types/compression": "^1.7.5",
     "@types/eslint__js": "^8.42.3",
+    "@types/express": "^4.17.21",
+    "@types/node-fetch": "^2.6.11",
     "eslint": "^8.57.0",
     "eslint-plugin-html": "^8.1.1",
     "eslint-plugin-sonarjs": "^1.0.4",
@@ -36,4 +37,4 @@
     "typescript": "^5.5.4",
     "typescript-eslint": "^7.17.0"
   }
-}
+}