Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

fix: use process.execPath for yt-dlp --js-runtimes to avoid unsupported Node.js from PATH

Alexey Clustere06ecd5b1fef
diff --git a/packages/tests/src/server-helpers/index.ts b/packages/tests/src/server-helpers/index.ts
index 28fd5d99cb..40e678e1eb 100644
--- a/packages/tests/src/server-helpers/index.ts
+++ b/packages/tests/src/server-helpers/index.ts
@@ -9,3 +9,4 @@ import './request.js'
import './validator.js'
import './version.js'
import './regexp.js'
+import './youtube-dl.js'
diff --git a/packages/tests/src/server-helpers/youtube-dl.ts b/packages/tests/src/server-helpers/youtube-dl.ts
new file mode 100644
index 0000000000..575e013795
--- /dev/null
+++ b/packages/tests/src/server-helpers/youtube-dl.ts
@@ -0,0 +1,95 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+
+import { expect } from 'chai'
+import { YoutubeDLCLI } from '@peertube/peertube-server/core/helpers/youtube-dl/youtube-dl-cli.js'
+import { CONFIG } from '@peertube/peertube-server/core/initializers/config.js'
+
+describe('YoutubeDLCLI', function () {
+
+ describe('wrapWithJSRuntimeOptions', function () {
+ let cli: any
+
+ before(function () {
+ cli = Object.create(YoutubeDLCLI.prototype)
+ })
+
+ it('Should include process.execPath in --js-runtimes when using yt-dlp', function () {
+ const originalDescriptor = Object.getOwnPropertyDescriptor(CONFIG.IMPORT.VIDEOS.HTTP.YOUTUBE_DL_RELEASE, 'NAME')
+
+ Object.defineProperty(CONFIG.IMPORT.VIDEOS.HTTP.YOUTUBE_DL_RELEASE, 'NAME', {
+ get: () => 'yt-dlp',
+ configurable: true
+ })
+
+ try {
+ const inputArgs = [ '--dump-json', '-f', 'best' ]
+ const result: string[] = cli.wrapWithJSRuntimeOptions(inputArgs)
+
+ expect(result[0]).to.equal('--js-runtimes')
+ expect(result[1]).to.equal('node:' + process.execPath)
+ expect(result[1]).to.match(/^node:\//)
+ expect(result.slice(2)).to.deep.equal(inputArgs)
+ } finally {
+ Object.defineProperty(CONFIG.IMPORT.VIDEOS.HTTP.YOUTUBE_DL_RELEASE, 'NAME', originalDescriptor)
+ }
+ })
+
+ it('Should not modify args when not using yt-dlp', function () {
+ const originalDescriptor = Object.getOwnPropertyDescriptor(CONFIG.IMPORT.VIDEOS.HTTP.YOUTUBE_DL_RELEASE, 'NAME')
+
+ Object.defineProperty(CONFIG.IMPORT.VIDEOS.HTTP.YOUTUBE_DL_RELEASE, 'NAME', {
+ get: () => 'youtube-dl',
+ configurable: true
+ })
+
+ try {
+ const inputArgs = [ '--dump-json', '-f', 'best' ]
+ const result: string[] = cli.wrapWithJSRuntimeOptions(inputArgs)
+
+ expect(result).to.deep.equal(inputArgs)
+ } finally {
+ Object.defineProperty(CONFIG.IMPORT.VIDEOS.HTTP.YOUTUBE_DL_RELEASE, 'NAME', originalDescriptor)
+ }
+ })
+
+ it('Should prepend runtime options before existing args', function () {
+ const originalDescriptor = Object.getOwnPropertyDescriptor(CONFIG.IMPORT.VIDEOS.HTTP.YOUTUBE_DL_RELEASE, 'NAME')
+
+ Object.defineProperty(CONFIG.IMPORT.VIDEOS.HTTP.YOUTUBE_DL_RELEASE, 'NAME', {
+ get: () => 'yt-dlp',
+ configurable: true
+ })
+
+ try {
+ const inputArgs = [ '--skip-download' ]
+ const result: string[] = cli.wrapWithJSRuntimeOptions(inputArgs)
+
+ expect(result).to.have.lengthOf(3)
+ expect(result[0]).to.equal('--js-runtimes')
+ expect(result[1]).to.equal('node:' + process.execPath)
+ expect(result[2]).to.equal('--skip-download')
+ } finally {
+ Object.defineProperty(CONFIG.IMPORT.VIDEOS.HTTP.YOUTUBE_DL_RELEASE, 'NAME', originalDescriptor)
+ }
+ })
+
+ it('Should handle empty args array', function () {
+ const originalDescriptor = Object.getOwnPropertyDescriptor(CONFIG.IMPORT.VIDEOS.HTTP.YOUTUBE_DL_RELEASE, 'NAME')
+
+ Object.defineProperty(CONFIG.IMPORT.VIDEOS.HTTP.YOUTUBE_DL_RELEASE, 'NAME', {
+ get: () => 'yt-dlp',
+ configurable: true
+ })
+
+ try {
+ const result: string[] = cli.wrapWithJSRuntimeOptions([])
+
+ expect(result).to.have.lengthOf(2)
+ expect(result[0]).to.equal('--js-runtimes')
+ expect(result[1]).to.equal('node:' + process.execPath)
+ } finally {
+ Object.defineProperty(CONFIG.IMPORT.VIDEOS.HTTP.YOUTUBE_DL_RELEASE, 'NAME', originalDescriptor)
+ }
+ })
+ })
+})
diff --git a/server/core/helpers/youtube-dl/youtube-dl-cli.ts b/server/core/helpers/youtube-dl/youtube-dl-cli.ts
index d86fea4dc7..299a3be988 100644
--- a/server/core/helpers/youtube-dl/youtube-dl-cli.ts
+++ b/server/core/helpers/youtube-dl/youtube-dl-cli.ts
@@ -239,7 +239,7 @@ export class YoutubeDLCLI {
private wrapWithJSRuntimeOptions (args: string[]) {
if (CONFIG.IMPORT.VIDEOS.HTTP.YOUTUBE_DL_RELEASE.NAME === 'yt-dlp') {
- return [ '--js-runtimes', 'node' ].concat(args)
+ return [ '--js-runtimes', 'node:' + process.execPath ].concat(args)
}
return args