X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftools%2Fpeertube-plugins.ts;h=0660c855f6d409565d08d110be725bda6e572954;hb=64aa66c4a61e1c6aa83a775e7af498e288ea82e4;hp=05b75fab2b3429829bf64a0c99dbae20f31353d4;hpb=7024e9120b381b5b3201212f5a18f5cdc14e15ff;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tools/peertube-plugins.ts b/server/tools/peertube-plugins.ts
index 05b75fab2..0660c855f 100644
--- 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 { PluginType } from '../../shared/models/plugins/plugin.type'
-import { installPlugin, listPlugins, uninstallPlugin, updatePlugin } from '../../shared/extra-utils/server/plugins'
-import { getAdminTokenOrDie, getServerCredentials } from './cli'
-import { PeerTubePlugin } from '../../shared/models/plugins/peertube-plugin.model'
+import CliTable3 from 'cli-table3'
+import { Command, OptionValues, program } from 'commander'
 import { isAbsolute } from 'path'
-import * as CliTable3 from 'cli-table3'
+import { PluginType } from '../../shared/models'
+import { assignToken, buildServer, getServerCredentials } from './shared'
 
 program
   .name('plugins')
@@ -23,7 +16,7 @@ program
   .option('-p, --password <token>', 'Password')
   .option('-t, --only-themes', 'List themes only')
   .option('-P, --only-plugins', 'List plugins only')
-  .action(() => pluginsListCLI())
+  .action((options, command) => pluginsListCLI(command, options))
 
 program
   .command('install')
@@ -33,7 +26,8 @@ program
   .option('-p, --password <token>', 'Password')
   .option('-P --path <path>', 'Install from a path')
   .option('-n, --npm-name <npmName>', 'Install from npm')
-  .action((options) => installPluginCLI(options))
+  .option('--plugin-version <pluginVersion>', 'Specify the plugin version to install (only available when installing from npm)')
+  .action((options, command) => installPluginCLI(command, options))
 
 program
   .command('update')
@@ -43,7 +37,7 @@ program
   .option('-p, --password <token>', 'Password')
   .option('-P --path <path>', 'Update from a path')
   .option('-n, --npm-name <npmName>', 'Update from npm')
-  .action((options) => updatePluginCLI(options))
+  .action((options, command) => updatePluginCLI(command, options))
 
 program
   .command('uninstall')
@@ -52,7 +46,7 @@ program
   .option('-U, --username <username>', 'Username')
   .option('-p, --password <token>', 'Password')
   .option('-n, --npm-name <npmName>', 'NPM plugin/theme name')
-  .action(options => uninstallPluginCLI(options))
+  .action((options, command) => uninstallPluginCLI(command, options))
 
 if (!process.argv.slice(2).length) {
   program.outputHelp()
@@ -62,30 +56,23 @@ program.parse(process.argv)
 
 // ----------------------------------------------------------------------------
 
-async function pluginsListCLI () {
-  const { url, username, password } = await getServerCredentials(program)
-  const accessToken = await getAdminTokenOrDie(url, username, password)
+async function pluginsListCLI (command: Command, options: OptionValues) {
+  const { url, username, password } = await getServerCredentials(command)
+  const server = buildServer(url)
+  await assignToken(server, username, password)
 
   let pluginType: PluginType
-  if (program['onlyThemes']) pluginType = PluginType.THEME
-  if (program['onlyPlugins']) pluginType = PluginType.PLUGIN
-
-  const res = await listPlugins({
-    url,
-    accessToken,
-    start: 0,
-    count: 100,
-    sort: 'name',
-    pluginType
-  })
-  const plugins: PeerTubePlugin[] = res.body.data
+  if (options.onlyThemes) pluginType = PluginType.THEME
+  if (options.onlyPlugins) pluginType = PluginType.PLUGIN
+
+  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,28 +88,24 @@ async function pluginsListCLI () {
   process.exit(0)
 }
 
-async function installPluginCLI (options: any) {
-  if (!options['path'] && !options['npmName']) {
+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()
     process.exit(-1)
   }
 
-  if (options['path'] && !isAbsolute(options['path'])) {
+  if (options.path && !isAbsolute(options.path)) {
     console.error('Path should be absolute.')
     process.exit(-1)
   }
 
-  const { url, username, password } = await getServerCredentials(options)
-  const accessToken = await getAdminTokenOrDie(url, username, password)
+  const { url, username, password } = await getServerCredentials(command)
+  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,28 +115,24 @@ async function installPluginCLI (options: any) {
   process.exit(0)
 }
 
-async function updatePluginCLI (options: any) {
-  if (!options['path'] && !options['npmName']) {
+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()
     process.exit(-1)
   }
 
-  if (options['path'] && !isAbsolute(options['path'])) {
+  if (options.path && !isAbsolute(options.path)) {
     console.error('Path should be absolute.')
     process.exit(-1)
   }
 
-  const { url, username, password } = await getServerCredentials(options)
-  const accessToken = await getAdminTokenOrDie(url, username, password)
+  const { url, username, password } = await getServerCredentials(command)
+  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,22 +142,19 @@ async function updatePluginCLI (options: any) {
   process.exit(0)
 }
 
-async function uninstallPluginCLI (options: any) {
-  if (!options['npmName']) {
+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()
     process.exit(-1)
   }
 
-  const { url, username, password } = await getServerCredentials(options)
-  const accessToken = await getAdminTokenOrDie(url, username, password)
+  const { url, username, password } = await getServerCredentials(command)
+  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)