diff --git a/common/package.json b/common/package.json index a88012b65..b64d9c72d 100644 --- a/common/package.json +++ b/common/package.json @@ -24,9 +24,16 @@ "test": "vitest run --coverage" }, "dependencies": { - "dayjs": "^1.10.4" + "dayjs": "^1.10.4", + "express-session": "^1.17.0", + "lodash": "^4.17.21", + "sponsorblock-api": "^0.2.2", + "ts-essentials": "^9.3.0", + "typescript": "5.3.3" }, "devDependencies": { + "@types/lodash": "^4.14.170", + "@types/node": "^18.13.0", "eslint-plugin-vitest": "0.3.22", "vitest": "^1.2.2" } diff --git a/server/package.json b/server/package.json index 88edd6c9b..49ca271b5 100644 --- a/server/package.json +++ b/server/package.json @@ -16,19 +16,22 @@ "dependencies": { "@divine/synchronization": "^1.2.1", "@ffprobe-installer/ffprobe": "2.1.1", + "@liveinstantly/dash-mpd-parser": "0.5.0", + "ansi-colors": "^4.1.1", + "axios": "1.4.0", "connect-redis": "7.1.0", "convict": "^6.2.4", + "dayjs": "^1.10.4", "express": "^4.17.1", "express-session": "^1.17.0", + "lodash": "^4.17.21", "m3u8-parser": "^6.2.0", - "@liveinstantly/dash-mpd-parser": "0.5.0", "nocache": "^3.0.0", "node-abort-controller": "3.0.1", "node-mailjet": "^6.0.3", "ott-common": "*", "passport": "0.6.0", "passport-discord": "^0.1.4", - "passport-google": "^0.3.0", "passport-http-bearer": "^1.0.1", "passport-local": "^1.0.0", "pg": "^8.0.3", @@ -41,24 +44,30 @@ "sequelize-cli": "^6.6.0", "sponsorblock-api": "^0.2.2", "toml": "^3.0.0", + "ts-essentials": "^9.3.0", "ts-node": "^10.9.1", "tslib": "^2.4.1", + "typescript": "5.3.3", "unique-names-generator": "^3.1.1", "uuid": "^9.0.0", + "validator": "^13.7.0", + "winston": "^3.10.0", "ws": "^7.4.6" }, "devDependencies": { "@types/convict": "^6.1.1", "@types/express": "^4.17.11", "@types/express-session": "^1.17.3", + "@types/lodash": "^4.14.170", "@types/node": "^18.13.0", "@types/passport": "1.0.12", "@types/passport-http-bearer": "^1.0.36", - "@types/redis": "^2.8.29", "@types/sequelize": "^4.28.9", "@types/supertest": "^2.0.11", + "@types/uuid": "^3.4.0", "@types/ws": "^7.4.4", "eslint-plugin-vitest": "0.3.22", + "faker": "^5.5.3", "nodemon": "^2.0.4", "redis-mock": "^0.56.3", "sqlite3": "5.1.5", diff --git a/yarn.lock b/yarn.lock index 247756072..b462ed649 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3806,13 +3806,6 @@ "@types/scheduler" "*" csstype "^3.0.2" -"@types/redis@^2.8.29": - version "2.8.32" - resolved "https://registry.yarnpkg.com/@types/redis/-/redis-2.8.32.tgz#1d3430219afbee10f8cfa389dad2571a05ecfb11" - integrity sha512-7jkMKxcGq9p242exlbsVzuJb57KqHRhNl4dHoQu2Y5v9bCAbtIXXH0R3HleSQW4CTOqpHIYUW3t6tpUj4BVQ+w== - dependencies: - "@types/node" "*" - "@types/scheduler@*": version "0.16.8" resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff" @@ -5251,6 +5244,15 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3" integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg== +axios@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f" + integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA== + dependencies: + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + axios@1.6.7: version "1.6.7" resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7" @@ -8198,7 +8200,7 @@ follow-redirects@^1.14.9: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== -follow-redirects@^1.15.4: +follow-redirects@^1.15.0, follow-redirects@^1.15.4: version "1.15.5" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020" integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw== @@ -11331,11 +11333,6 @@ open@^7.4.2: is-docker "^2.0.0" is-wsl "^2.1.1" -openid@0.5.x: - version "0.5.13" - resolved "https://registry.yarnpkg.com/openid/-/openid-0.5.13.tgz#1b8eb6ca8c7aee6dd6264b69dafb9ad7852c2a4d" - integrity sha512-MdWOwHQPaJ3B+7JnPiTyEEqJsMpoNv/+Q4JObuW5jt6xEpIdHaoazFtrcbukBjLg2+qj5xXOmc9TsqhCEw3HOw== - optionator@^0.8.1: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" @@ -11478,14 +11475,6 @@ passport-discord@^0.1.4: dependencies: passport-oauth2 "^1.5.0" -passport-google@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/passport-google/-/passport-google-0.3.0.tgz#c5b4b4162658892b37165b795a01ffd4c7e19fb7" - integrity sha512-sgm38NqzC3zRZ4ypsih4Qd84TQHGnDYi0ptvTOzva84Qzu70ZPajUL9CVrKE/FKdF1jwo44v3iGTSS92Ltll8Q== - dependencies: - passport-openid "0.3.x" - pkginfo "0.2.x" - passport-http-bearer@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/passport-http-bearer/-/passport-http-bearer-1.0.1.tgz#147469ea3669e2a84c6167ef99dbb77e1f0098a8" @@ -11511,15 +11500,6 @@ passport-oauth2@^1.5.0: uid2 "0.0.x" utils-merge "1.x.x" -passport-openid@0.3.x: - version "0.3.1" - resolved "https://registry.yarnpkg.com/passport-openid/-/passport-openid-0.3.1.tgz#e64de04859fa51b6529480174122621e08fa22cb" - integrity sha512-tpSI98hDjDB3aPWOklYIs6Qw9uQk1vLgR5JjHUgpLyR2BhonBNT923ynRL7JTmvKsnc2UhDHCk2k/HqIMdPs4A== - dependencies: - openid "0.5.x" - passport "~0.1.3" - pkginfo "0.2.x" - passport-strategy@1.x.x: version "1.0.0" resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4" @@ -11534,14 +11514,6 @@ passport@0.6.0: pause "0.0.1" utils-merge "^1.0.1" -passport@~0.1.3: - version "0.1.18" - resolved "https://registry.yarnpkg.com/passport/-/passport-0.1.18.tgz#c8264479dcb6414cadbb66752d12b37e0b6525a1" - integrity sha512-qteYojKG/qth7UBbbGU7aqhe5ndJs6YaUkH2B6+7FWQ0OeyYmWknzOATpMhdoSTDcLLliq9n4Fcy1mGs80iUMw== - dependencies: - pause "0.0.1" - pkginfo "0.2.x" - patch-package@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-7.0.1.tgz#ab6a20489f9d0253726fc692f60d3d4a2d3fc9cf" @@ -11758,11 +11730,6 @@ pkg-types@^1.0.3: mlly "^1.2.0" pathe "^1.1.0" -pkginfo@0.2.x: - version "0.2.3" - resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.2.3.tgz#7239c42a5ef6c30b8f328439d9b9ff71042490f8" - integrity sha512-7W7wTrE/NsY8xv/DTGjwNIyNah81EQH0MWcTzrHL6pOpMocOGZc0Mbdz9aXxSrp+U0mSmkU8jrNCDCfUs3sOBg== - plyr@3.7.8: version "3.7.8" resolved "https://registry.yarnpkg.com/plyr/-/plyr-3.7.8.tgz#b79bccc23687705b5d9a283b2a88c124bf7471ed"