diff --git a/server/.pnp.cjs b/server/.pnp.cjs index 66301fe2..971dce73 100644 --- a/server/.pnp.cjs +++ b/server/.pnp.cjs @@ -41,8 +41,7 @@ const RAW_RUNTIME_STATE = ["@types/ws", "npm:8.5.3"],\ ["@typescript-eslint/eslint-plugin", "virtual:d78a2ce42d5279889122669697987a3f9ba038f8d2a01bb5bb7cc449b44eb1ac843364d15adc7813894c4f6884ebaf23a3b942d248859563cf369b98d76414a7#npm:6.12.0"],\ ["@typescript-eslint/parser", "virtual:d78a2ce42d5279889122669697987a3f9ba038f8d2a01bb5bb7cc449b44eb1ac843364d15adc7813894c4f6884ebaf23a3b942d248859563cf369b98d76414a7#npm:6.12.0"],\ - ["axios", "npm:1.7.9"],\ - ["axios-cookiejar-support", "virtual:d78a2ce42d5279889122669697987a3f9ba038f8d2a01bb5bb7cc449b44eb1ac843364d15adc7813894c4f6884ebaf23a3b942d248859563cf369b98d76414a7#npm:5.0.5"],\ + ["axios", "npm:1.6.8"],\ ["basic-auth", "npm:2.0.1"],\ ["chalk", "npm:4.1.2"],\ ["check-disk-space", "npm:3.4.0"],\ @@ -77,7 +76,6 @@ const RAW_RUNTIME_STATE = ["prettier", "npm:3.0.0"],\ ["sanitize-filename", "npm:1.6.3"],\ ["supertest", "npm:6.3.3"],\ - ["tough-cookie", "npm:5.0.0"],\ ["true-case-path", "npm:2.2.1"],\ ["ts-jest", "virtual:d78a2ce42d5279889122669697987a3f9ba038f8d2a01bb5bb7cc449b44eb1ac843364d15adc7813894c4f6884ebaf23a3b942d248859563cf369b98d76414a7#npm:29.1.1"],\ ["ts-node", "virtual:d78a2ce42d5279889122669697987a3f9ba038f8d2a01bb5bb7cc449b44eb1ac843364d15adc7813894c4f6884ebaf23a3b942d248859563cf369b98d76414a7#npm:10.9.1"],\ @@ -2724,13 +2722,6 @@ const RAW_RUNTIME_STATE = ["debug", "virtual:428f325a939c2653ad822eb3d75efb02ac311523dd0d4f9645afc39ea00bd86eceac35a9d59c9b6977d76b670a4ef0ae057ea572338a44729aa592711a8c05a3#npm:4.3.3"]\ ],\ "linkType": "HARD"\ - }],\ - ["npm:7.1.3", {\ - "packageLocation": "./.yarn/cache/agent-base-npm-7.1.3-b2c16e72fb-3db6d8d465.zip/node_modules/agent-base/",\ - "packageDependencies": [\ - ["agent-base", "npm:7.1.3"]\ - ],\ - "linkType": "HARD"\ }]\ ]],\ ["agentkeepalive", [\ @@ -3015,44 +3006,17 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["axios", [\ - ["npm:1.7.9", {\ - "packageLocation": "./.yarn/cache/axios-npm-1.7.9-3c98466f87-b7a5f660ea.zip/node_modules/axios/",\ + ["npm:1.6.8", {\ + "packageLocation": "./.yarn/cache/axios-npm-1.6.8-85cf1e7152-3f9a79eaf1.zip/node_modules/axios/",\ "packageDependencies": [\ - ["axios", "npm:1.7.9"],\ - ["follow-redirects", "virtual:3c98466f874305529f1a16589101c28705aa489e7ec8ffcbfb5cc062090761c951973322264d8039ff40de705a591171bac1067843c49b197410972b4a9ed9f4#npm:1.15.6"],\ + ["axios", "npm:1.6.8"],\ + ["follow-redirects", "virtual:85cf1e7152e3c0d8e39e61ad2b81b59a43fb6bdb8f3bf49869bb97804b1403ecaee4505fcb0d4869cfdd99ee3eaa880b79498575407fb770c800bf64c64156ec#npm:1.15.6"],\ ["form-data", "npm:4.0.0"],\ ["proxy-from-env", "npm:1.1.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ - ["axios-cookiejar-support", [\ - ["npm:5.0.5", {\ - "packageLocation": "./.yarn/cache/axios-cookiejar-support-npm-5.0.5-fbdf9ef825-4d3acdef40.zip/node_modules/axios-cookiejar-support/",\ - "packageDependencies": [\ - ["axios-cookiejar-support", "npm:5.0.5"]\ - ],\ - "linkType": "SOFT"\ - }],\ - ["virtual:d78a2ce42d5279889122669697987a3f9ba038f8d2a01bb5bb7cc449b44eb1ac843364d15adc7813894c4f6884ebaf23a3b942d248859563cf369b98d76414a7#npm:5.0.5", {\ - "packageLocation": "./.yarn/__virtual__/axios-cookiejar-support-virtual-66f30d5cad/0/cache/axios-cookiejar-support-npm-5.0.5-fbdf9ef825-4d3acdef40.zip/node_modules/axios-cookiejar-support/",\ - "packageDependencies": [\ - ["axios-cookiejar-support", "virtual:d78a2ce42d5279889122669697987a3f9ba038f8d2a01bb5bb7cc449b44eb1ac843364d15adc7813894c4f6884ebaf23a3b942d248859563cf369b98d76414a7#npm:5.0.5"],\ - ["@types/axios", null],\ - ["@types/tough-cookie", null],\ - ["axios", "npm:1.7.9"],\ - ["http-cookie-agent", "virtual:66f30d5cad55dba7f7b41b5387b40abf47f7511e45d58a57c155c4cdac15a7328630b5a4a75686d8a9621e72049a799428fbbd59b8f98cfbe3df67a94343b8f2#npm:6.0.8"],\ - ["tough-cookie", "npm:5.0.0"]\ - ],\ - "packagePeers": [\ - "@types/axios",\ - "@types/tough-cookie",\ - "axios",\ - "tough-cookie"\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["babel-jest", [\ ["npm:29.6.1", {\ "packageLocation": "./.yarn/cache/babel-jest-npm-29.6.1-d3591ae5ed-abdc2d7856.zip/node_modules/babel-jest/",\ @@ -5151,10 +5115,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:3c98466f874305529f1a16589101c28705aa489e7ec8ffcbfb5cc062090761c951973322264d8039ff40de705a591171bac1067843c49b197410972b4a9ed9f4#npm:1.15.6", {\ - "packageLocation": "./.yarn/__virtual__/follow-redirects-virtual-70c04bb564/0/cache/follow-redirects-npm-1.15.6-50635fe51d-70c7612c4c.zip/node_modules/follow-redirects/",\ + ["virtual:85cf1e7152e3c0d8e39e61ad2b81b59a43fb6bdb8f3bf49869bb97804b1403ecaee4505fcb0d4869cfdd99ee3eaa880b79498575407fb770c800bf64c64156ec#npm:1.15.6", {\ + "packageLocation": "./.yarn/__virtual__/follow-redirects-virtual-7bb5ea93fd/0/cache/follow-redirects-npm-1.15.6-50635fe51d-70c7612c4c.zip/node_modules/follow-redirects/",\ "packageDependencies": [\ - ["follow-redirects", "virtual:3c98466f874305529f1a16589101c28705aa489e7ec8ffcbfb5cc062090761c951973322264d8039ff40de705a591171bac1067843c49b197410972b4a9ed9f4#npm:1.15.6"],\ + ["follow-redirects", "virtual:85cf1e7152e3c0d8e39e61ad2b81b59a43fb6bdb8f3bf49869bb97804b1403ecaee4505fcb0d4869cfdd99ee3eaa880b79498575407fb770c800bf64c64156ec#npm:1.15.6"],\ ["@types/debug", null],\ ["debug", null]\ ],\ @@ -5748,33 +5712,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["http-cookie-agent", [\ - ["npm:6.0.8", {\ - "packageLocation": "./.yarn/cache/http-cookie-agent-npm-6.0.8-34bc9d3ed4-16880d7037.zip/node_modules/http-cookie-agent/",\ - "packageDependencies": [\ - ["http-cookie-agent", "npm:6.0.8"]\ - ],\ - "linkType": "SOFT"\ - }],\ - ["virtual:66f30d5cad55dba7f7b41b5387b40abf47f7511e45d58a57c155c4cdac15a7328630b5a4a75686d8a9621e72049a799428fbbd59b8f98cfbe3df67a94343b8f2#npm:6.0.8", {\ - "packageLocation": "./.yarn/__virtual__/http-cookie-agent-virtual-33383d1f89/0/cache/http-cookie-agent-npm-6.0.8-34bc9d3ed4-16880d7037.zip/node_modules/http-cookie-agent/",\ - "packageDependencies": [\ - ["http-cookie-agent", "virtual:66f30d5cad55dba7f7b41b5387b40abf47f7511e45d58a57c155c4cdac15a7328630b5a4a75686d8a9621e72049a799428fbbd59b8f98cfbe3df67a94343b8f2#npm:6.0.8"],\ - ["@types/tough-cookie", null],\ - ["@types/undici", null],\ - ["agent-base", "npm:7.1.3"],\ - ["tough-cookie", "npm:5.0.0"],\ - ["undici", null]\ - ],\ - "packagePeers": [\ - "@types/tough-cookie",\ - "@types/undici",\ - "tough-cookie",\ - "undici"\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["http-errors", [\ ["npm:2.0.0", {\ "packageLocation": "./.yarn/cache/http-errors-npm-2.0.0-3f1c503428-0e7f76ee8f.zip/node_modules/http-errors/",\ @@ -7151,8 +7088,7 @@ const RAW_RUNTIME_STATE = ["@types/ws", "npm:8.5.3"],\ ["@typescript-eslint/eslint-plugin", "virtual:d78a2ce42d5279889122669697987a3f9ba038f8d2a01bb5bb7cc449b44eb1ac843364d15adc7813894c4f6884ebaf23a3b942d248859563cf369b98d76414a7#npm:6.12.0"],\ ["@typescript-eslint/parser", "virtual:d78a2ce42d5279889122669697987a3f9ba038f8d2a01bb5bb7cc449b44eb1ac843364d15adc7813894c4f6884ebaf23a3b942d248859563cf369b98d76414a7#npm:6.12.0"],\ - ["axios", "npm:1.7.9"],\ - ["axios-cookiejar-support", "virtual:d78a2ce42d5279889122669697987a3f9ba038f8d2a01bb5bb7cc449b44eb1ac843364d15adc7813894c4f6884ebaf23a3b942d248859563cf369b98d76414a7#npm:5.0.5"],\ + ["axios", "npm:1.6.8"],\ ["basic-auth", "npm:2.0.1"],\ ["chalk", "npm:4.1.2"],\ ["check-disk-space", "npm:3.4.0"],\ @@ -7187,7 +7123,6 @@ const RAW_RUNTIME_STATE = ["prettier", "npm:3.0.0"],\ ["sanitize-filename", "npm:1.6.3"],\ ["supertest", "npm:6.3.3"],\ - ["tough-cookie", "npm:5.0.0"],\ ["true-case-path", "npm:2.2.1"],\ ["ts-jest", "virtual:d78a2ce42d5279889122669697987a3f9ba038f8d2a01bb5bb7cc449b44eb1ac843364d15adc7813894c4f6884ebaf23a3b942d248859563cf369b98d76414a7#npm:29.1.1"],\ ["ts-node", "virtual:d78a2ce42d5279889122669697987a3f9ba038f8d2a01bb5bb7cc449b44eb1ac843364d15adc7813894c4f6884ebaf23a3b942d248859563cf369b98d76414a7#npm:10.9.1"],\ @@ -9093,25 +9028,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["tldts", [\ - ["npm:6.1.71", {\ - "packageLocation": "./.yarn/cache/tldts-npm-6.1.71-74ea01b8d1-6a3e9ebf14.zip/node_modules/tldts/",\ - "packageDependencies": [\ - ["tldts", "npm:6.1.71"],\ - ["tldts-core", "npm:6.1.71"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["tldts-core", [\ - ["npm:6.1.71", {\ - "packageLocation": "./.yarn/cache/tldts-core-npm-6.1.71-cc68dd578b-9bed9e0679.zip/node_modules/tldts-core/",\ - "packageDependencies": [\ - ["tldts-core", "npm:6.1.71"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["tmpl", [\ ["npm:1.0.5", {\ "packageLocation": "./.yarn/cache/tmpl-npm-1.0.5-d399ba37e2-cd922d9b85.zip/node_modules/tmpl/",\ @@ -9159,16 +9075,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["tough-cookie", [\ - ["npm:5.0.0", {\ - "packageLocation": "./.yarn/cache/tough-cookie-npm-5.0.0-93c44236b9-a98d3846ed.zip/node_modules/tough-cookie/",\ - "packageDependencies": [\ - ["tough-cookie", "npm:5.0.0"],\ - ["tldts", "npm:6.1.71"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["tr46", [\ ["npm:0.0.3", {\ "packageLocation": "./.yarn/cache/tr46-npm-0.0.3-de53018915-8f1f5aa6cb.zip/node_modules/tr46/",\ diff --git a/server/.yarn/cache/agent-base-npm-7.1.3-b2c16e72fb-3db6d8d465.zip b/server/.yarn/cache/agent-base-npm-7.1.3-b2c16e72fb-3db6d8d465.zip deleted file mode 100644 index 76775d59..00000000 Binary files a/server/.yarn/cache/agent-base-npm-7.1.3-b2c16e72fb-3db6d8d465.zip and /dev/null differ diff --git a/server/.yarn/cache/axios-cookiejar-support-npm-5.0.5-fbdf9ef825-4d3acdef40.zip b/server/.yarn/cache/axios-cookiejar-support-npm-5.0.5-fbdf9ef825-4d3acdef40.zip deleted file mode 100644 index 6522a88c..00000000 Binary files a/server/.yarn/cache/axios-cookiejar-support-npm-5.0.5-fbdf9ef825-4d3acdef40.zip and /dev/null differ diff --git a/server/.yarn/cache/axios-npm-1.6.8-85cf1e7152-3f9a79eaf1.zip b/server/.yarn/cache/axios-npm-1.6.8-85cf1e7152-3f9a79eaf1.zip new file mode 100644 index 00000000..4b98ec2e Binary files /dev/null and b/server/.yarn/cache/axios-npm-1.6.8-85cf1e7152-3f9a79eaf1.zip differ diff --git a/server/.yarn/cache/axios-npm-1.7.9-3c98466f87-b7a5f660ea.zip b/server/.yarn/cache/axios-npm-1.7.9-3c98466f87-b7a5f660ea.zip deleted file mode 100644 index 34043672..00000000 Binary files a/server/.yarn/cache/axios-npm-1.7.9-3c98466f87-b7a5f660ea.zip and /dev/null differ diff --git a/server/.yarn/cache/http-cookie-agent-npm-6.0.8-34bc9d3ed4-16880d7037.zip b/server/.yarn/cache/http-cookie-agent-npm-6.0.8-34bc9d3ed4-16880d7037.zip deleted file mode 100644 index aae9d2da..00000000 Binary files a/server/.yarn/cache/http-cookie-agent-npm-6.0.8-34bc9d3ed4-16880d7037.zip and /dev/null differ diff --git a/server/.yarn/cache/tldts-core-npm-6.1.71-cc68dd578b-9bed9e0679.zip b/server/.yarn/cache/tldts-core-npm-6.1.71-cc68dd578b-9bed9e0679.zip deleted file mode 100644 index 43252c9a..00000000 Binary files a/server/.yarn/cache/tldts-core-npm-6.1.71-cc68dd578b-9bed9e0679.zip and /dev/null differ diff --git a/server/.yarn/cache/tldts-npm-6.1.71-74ea01b8d1-6a3e9ebf14.zip b/server/.yarn/cache/tldts-npm-6.1.71-74ea01b8d1-6a3e9ebf14.zip deleted file mode 100644 index 8753b625..00000000 Binary files a/server/.yarn/cache/tldts-npm-6.1.71-74ea01b8d1-6a3e9ebf14.zip and /dev/null differ diff --git a/server/.yarn/cache/tough-cookie-npm-5.0.0-93c44236b9-a98d3846ed.zip b/server/.yarn/cache/tough-cookie-npm-5.0.0-93c44236b9-a98d3846ed.zip deleted file mode 100644 index 60454ce4..00000000 Binary files a/server/.yarn/cache/tough-cookie-npm-5.0.0-93c44236b9-a98d3846ed.zip and /dev/null differ diff --git a/server/package.json b/server/package.json index 20fb8535..398584e0 100644 --- a/server/package.json +++ b/server/package.json @@ -53,8 +53,7 @@ }, "dependencies": { "@googleapis/youtube": "^10.0.0", - "axios": "^1.7.9", - "axios-cookiejar-support": "^5.0.5", + "axios": "^1.6.8", "basic-auth": "^2.0.1", "chalk": "4.1.2", "check-disk-space": "^3.4.0", @@ -75,7 +74,6 @@ "minimist": "^1.2.8", "morgan": "^1.10.0", "sanitize-filename": "^1.6.3", - "tough-cookie": "^5.0.0", "true-case-path": "^2.2.1", "winston": "^3.10.0", "winston-daily-rotate-file": "^4.7.1", @@ -91,4 +89,4 @@ "unplugged": true } } -} +} \ No newline at end of file diff --git a/server/yarn.lock b/server/yarn.lock index 5e49ccdd..782e6d2e 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -1979,13 +1979,6 @@ __metadata: languageName: node linkType: hard -"agent-base@npm:^7.1.3": - version: 7.1.3 - resolution: "agent-base@npm:7.1.3" - checksum: 3db6d8d4651f2aa1a9e4af35b96ab11a7607af57a24f3bc721a387eaa3b5f674e901f0a648b0caefd48f3fd117c7761b79a3b55854e2aebaa96c3f32cf76af84 - languageName: node - linkType: hard - "agentkeepalive@npm:^4.2.1": version: 4.2.1 resolution: "agentkeepalive@npm:4.2.1" @@ -2234,26 +2227,14 @@ __metadata: languageName: node linkType: hard -"axios-cookiejar-support@npm:^5.0.5": - version: 5.0.5 - resolution: "axios-cookiejar-support@npm:5.0.5" - dependencies: - http-cookie-agent: "npm:^6.0.8" - peerDependencies: - axios: ">=0.20.0" - tough-cookie: ">=4.0.0" - checksum: 4d3acdef40ee54dd76941c5551de61b5cd71dc7a4be75a918a77dd52905758b84d9b43e3c56bd92a4e281f3be2e799e9ec1491fbf5178bb1aa1c5e4c15f2164e - languageName: node - linkType: hard - -"axios@npm:^1.7.9": - version: 1.7.9 - resolution: "axios@npm:1.7.9" +"axios@npm:^1.6.8": + version: 1.6.8 + resolution: "axios@npm:1.6.8" dependencies: follow-redirects: "npm:^1.15.6" form-data: "npm:^4.0.0" proxy-from-env: "npm:^1.1.0" - checksum: b7a5f660ea53ba9c2a745bf5ad77ad8bf4f1338e13ccc3f9f09f810267d6c638c03dac88b55dae8dc98b79c57d2d6835be651d58d2af97c174f43d289a9fd007 + checksum: 3f9a79eaf1d159544fca9576261ff867cbbff64ed30017848e4210e49f3b01e97cf416390150e6fdf6633f336cd43dc1151f890bbd09c3c01ad60bb0891eee63 languageName: node linkType: hard @@ -4511,21 +4492,6 @@ __metadata: languageName: node linkType: hard -"http-cookie-agent@npm:^6.0.8": - version: 6.0.8 - resolution: "http-cookie-agent@npm:6.0.8" - dependencies: - agent-base: "npm:^7.1.3" - peerDependencies: - tough-cookie: ^4.0.0 || ^5.0.0 - undici: ^5.11.0 || ^6.0.0 - peerDependenciesMeta: - undici: - optional: true - checksum: 16880d703707aa7609b92e62491ef8059b62effd9b19cdf2f8d49b5bdcab60c57c3e210c89d2126d0343347a4d6fe7e285b9f64b498518714c65486bac931f87 - languageName: node - linkType: hard - "http-errors@npm:2.0.0": version: 2.0.0 resolution: "http-errors@npm:2.0.0" @@ -5739,8 +5705,7 @@ __metadata: "@types/ws": "npm:^8.5.3" "@typescript-eslint/eslint-plugin": "npm:^6.12.0" "@typescript-eslint/parser": "npm:^6.12.0" - axios: "npm:^1.7.9" - axios-cookiejar-support: "npm:^5.0.5" + axios: "npm:^1.6.8" basic-auth: "npm:^2.0.1" chalk: "npm:4.1.2" check-disk-space: "npm:^3.4.0" @@ -5775,7 +5740,6 @@ __metadata: prettier: "npm:^3.0.0" sanitize-filename: "npm:^1.6.3" supertest: "npm:^6.3.3" - tough-cookie: "npm:^5.0.0" true-case-path: "npm:^2.2.1" ts-jest: "npm:^29.1.1" ts-node: "npm:^10.9.1" @@ -7520,24 +7484,6 @@ __metadata: languageName: node linkType: hard -"tldts-core@npm:^6.1.71": - version: 6.1.71 - resolution: "tldts-core@npm:6.1.71" - checksum: 9bed9e06791c9044d5f6cfe75c7b685c650c1d5cd3fc6f8c5ee3b24478925a1c356a621fe592b889f11b340e5db96a8876ec810379abad11c71700c9d4fe86b7 - languageName: node - linkType: hard - -"tldts@npm:^6.1.32": - version: 6.1.71 - resolution: "tldts@npm:6.1.71" - dependencies: - tldts-core: "npm:^6.1.71" - bin: - tldts: bin/cli.js - checksum: 6a3e9ebf140c45ce5e179b3d9011b6b828c14bacfb2834f3ca61e8a5557b29b2a4e0b62da2c0382156d09e265e0f16255b5acdfef1cbccb25d7cd051ef11e9eb - languageName: node - linkType: hard - "tmpl@npm:1.0.5": version: 1.0.5 resolution: "tmpl@npm:1.0.5" @@ -7579,15 +7525,6 @@ __metadata: languageName: node linkType: hard -"tough-cookie@npm:^5.0.0": - version: 5.0.0 - resolution: "tough-cookie@npm:5.0.0" - dependencies: - tldts: "npm:^6.1.32" - checksum: a98d3846ed386e399e8b470c1eb08a6a296944246eabc55c9fe79d629bd2cdaa62f5a6572f271fe0060987906bd20468d72a219a3b4cbe51086bea48d2d677b6 - languageName: node - linkType: hard - "tr46@npm:~0.0.3": version: 0.0.3 resolution: "tr46@npm:0.0.3"