Don't fail remote transcoding on retry

[github/Chocobozzz/PeerTube.git] / server / tools / peertube-plugins.ts

diff --git a/server/tools/peertube-plugins.ts b/server/tools/peertube-plugins.ts
index cb591377ba29d7ed48a8c02dd05fa79270e9a7f2..0660c855f6d409565d08d110be725bda6e572954 100644 (file)
--- a/server/tools/peertube-plugins.ts
+++ b/server/tools/peertube-plugins.ts
@@ -1,15 +1,8 @@
-// eslint-disable @typescript-eslint/no-unnecessary-type-assertion
-
-import { registerTSPaths } from '../helpers/register-ts-paths'
-registerTSPaths()
-
-import * as program from 'commander'
-import { installPlugin, listPlugins, uninstallPlugin, updatePlugin } from '../../shared/extra-utils/server/plugins'
-import { getAdminTokenOrDie, getServerCredentials } from './cli'
-import { PeerTubePlugin, PluginType } from '../../shared/models'
+import CliTable3 from 'cli-table3'
+import { Command, OptionValues, program } from 'commander'
 import { isAbsolute } from 'path'
-import * as CliTable3 from 'cli-table3'
-import commander = require('commander')
+import { PluginType } from '../../shared/models'
+import { assignToken, buildServer, getServerCredentials } from './shared'
 
 program
   .name('plugins')
@@ -33,6 +26,7 @@ program
   .option('-p, --password <token>', 'Password')
   .option('-P --path <path>', 'Install from a path')
   .option('-n, --npm-name <npmName>', 'Install from npm')
+  .option('--plugin-version <pluginVersion>', 'Specify the plugin version to install (only available when installing from npm)')
   .action((options, command) => installPluginCLI(command, options))
 
 program
@@ -62,30 +56,23 @@ program.parse(process.argv)
 
 // ----------------------------------------------------------------------------
 
-async function pluginsListCLI (command: commander.CommanderStatic, options: commander.OptionValues) {
+async function pluginsListCLI (command: Command, options: OptionValues) {
   const { url, username, password } = await getServerCredentials(command)
-  const accessToken = await getAdminTokenOrDie(url, username, password)
+  const server = buildServer(url)
+  await assignToken(server, username, password)
 
   let pluginType: PluginType
   if (options.onlyThemes) pluginType = PluginType.THEME
   if (options.onlyPlugins) pluginType = PluginType.PLUGIN
 
-  const res = await listPlugins({
-    url,
-    accessToken,
-    start: 0,
-    count: 100,
-    sort: 'name',
-    pluginType
-  })
-  const plugins: PeerTubePlugin[] = res.body.data
+  const { data } = await server.plugins.list({ start: 0, count: 100, sort: 'name', pluginType })
 
   const table = new CliTable3({
     head: [ 'name', 'version', 'homepage' ],
-    colWidths: [ 50, 10, 50 ]
+    colWidths: [ 50, 20, 50 ]
   }) as any
 
-  for (const plugin of plugins) {
+  for (const plugin of data) {
     const npmName = plugin.type === PluginType.PLUGIN
       ? 'peertube-plugin-' + plugin.name
       : 'peertube-theme-' + plugin.name
@@ -101,7 +88,7 @@ async function pluginsListCLI (command: commander.CommanderStatic, options: comm
   process.exit(0)
 }
 
-async function installPluginCLI (command: commander.CommanderStatic, options: commander.OptionValues) {
+async function installPluginCLI (command: Command, options: OptionValues) {
   if (!options.path && !options.npmName) {
     console.error('You need to specify the npm name or the path of the plugin you want to install.\n')
     program.outputHelp()
@@ -114,15 +101,11 @@ async function installPluginCLI (command: commander.CommanderStatic, options: co
   }
 
   const { url, username, password } = await getServerCredentials(command)
-  const accessToken = await getAdminTokenOrDie(url, username, password)
+  const server = buildServer(url)
+  await assignToken(server, username, password)
 
   try {
-    await installPlugin({
-      url,
-      accessToken,
-      npmName: options.npmName,
-      path: options.path
-    })
+    await server.plugins.install({ npmName: options.npmName, path: options.path, pluginVersion: options.pluginVersion })
   } catch (err) {
     console.error('Cannot install plugin.', err)
     process.exit(-1)
@@ -132,7 +115,7 @@ async function installPluginCLI (command: commander.CommanderStatic, options: co
   process.exit(0)
 }
 
-async function updatePluginCLI (command: commander.CommanderStatic, options: commander.OptionValues) {
+async function updatePluginCLI (command: Command, options: OptionValues) {
   if (!options.path && !options.npmName) {
     console.error('You need to specify the npm name or the path of the plugin you want to update.\n')
     program.outputHelp()
@@ -145,15 +128,11 @@ async function updatePluginCLI (command: commander.CommanderStatic, options: com
   }
 
   const { url, username, password } = await getServerCredentials(command)
-  const accessToken = await getAdminTokenOrDie(url, username, password)
+  const server = buildServer(url)
+  await assignToken(server, username, password)
 
   try {
-    await updatePlugin({
-      url,
-      accessToken,
-      npmName: options.npmName,
-      path: options.path
-    })
+    await server.plugins.update({ npmName: options.npmName, path: options.path })
   } catch (err) {
     console.error('Cannot update plugin.', err)
     process.exit(-1)
@@ -163,7 +142,7 @@ async function updatePluginCLI (command: commander.CommanderStatic, options: com
   process.exit(0)
 }
 
-async function uninstallPluginCLI (command: commander.CommanderStatic, options: commander.OptionValues) {
+async function uninstallPluginCLI (command: Command, options: OptionValues) {
   if (!options.npmName) {
     console.error('You need to specify the npm name of the plugin/theme you want to uninstall.\n')
     program.outputHelp()
@@ -171,14 +150,11 @@ async function uninstallPluginCLI (command: commander.CommanderStatic, options:
   }
 
   const { url, username, password } = await getServerCredentials(command)
-  const accessToken = await getAdminTokenOrDie(url, username, password)
+  const server = buildServer(url)
+  await assignToken(server, username, password)
 
   try {
-    await uninstallPlugin({
-      url,
-      accessToken,
-      npmName: options.npmName
-    })
+    await server.plugins.uninstall({ npmName: options.npmName })
   } catch (err) {
     console.error('Cannot uninstall plugin.', err)
     process.exit(-1)