+// eslint-disable @typescript-eslint/no-unnecessary-type-assertion
+
+import { registerTSPaths } from '../helpers/register-ts-paths'
+registerTSPaths()
+
import * as program from 'commander'
import * as prompt from 'prompt'
-const Table = require('cli-table')
-import { getSettings, writeSettings, netrc } from './cli'
-import { isHostValid } from '../helpers/custom-validators/servers'
+import { getNetrc, getSettings, writeSettings } from './cli'
import { isUserUsernameValid } from '../helpers/custom-validators/users'
+import { getAccessToken } from '../../shared/extra-utils'
+import * as CliTable3 from 'cli-table3'
-function delInstance (url: string) {
- return new Promise((res, rej): void => {
- getSettings()
- .then(async (settings) => {
- settings.remotes.splice(settings.remotes.indexOf(url))
- await writeSettings(settings)
- delete netrc.machines[url]
- netrc.save()
- res()
- })
- .catch(err => rej(err))
- })
+async function delInstance (url: string) {
+ const [ settings, netrc ] = await Promise.all([ getSettings(), getNetrc() ])
+
+ const index = settings.remotes.indexOf(url)
+ settings.remotes.splice(index)
+
+ if (settings.default === index) settings.default = -1
+
+ await writeSettings(settings)
+
+ delete netrc.machines[url]
+
+ await netrc.save()
}
-async function setInstance (url: string, username: string, password: string) {
- return new Promise((res, rej): void => {
- getSettings()
- .then(async settings => {
- if (settings.remotes.indexOf(url) === -1) {
- settings.remotes.push(url)
- }
- await writeSettings(settings)
- netrc.machines[url] = { login: username, password }
- netrc.save()
- res()
- })
- .catch(err => rej(err))
- })
+async function setInstance (url: string, username: string, password: string, isDefault: boolean) {
+ const [ settings, netrc ] = await Promise.all([ getSettings(), getNetrc() ])
+
+ if (settings.remotes.includes(url) === false) {
+ settings.remotes.push(url)
+ }
+
+ if (isDefault || settings.remotes.length === 1) {
+ settings.default = settings.remotes.length - 1
+ }
+
+ await writeSettings(settings)
+
+ netrc.machines[url] = { login: username, password }
+ await netrc.save()
}
function isURLaPeerTubeInstance (url: string) {
- return isHostValid(url) || (url.includes('localhost'))
+ return url.startsWith('http://') || url.startsWith('https://')
+}
+
+function stripExtraneousFromPeerTubeUrl (url: string) {
+ // Get everything before the 3rd /.
+ const urlLength = url.includes('/', 8)
+ ? url.indexOf('/', 8)
+ : url.length
+
+ return url.substr(0, urlLength)
}
program
url: {
description: 'instance url',
conform: (value) => isURLaPeerTubeInstance(value),
+ message: 'It should be an URL (https://peertube.example.com)',
required: true
},
username: {
required: true
}
}
- }, (_, result) => {
- setInstance(result.url, result.username, result.password)
+ }, async (_, result) => {
+
+ // Check credentials
+ try {
+ // Strip out everything after the domain:port.
+ // @see https://github.com/Chocobozzz/PeerTube/issues/3520
+ result.url = stripExtraneousFromPeerTubeUrl(result.url)
+
+ await getAccessToken(result.url, result.username, result.password)
+ } catch (err) {
+ console.error(err.message)
+ process.exit(-1)
+ }
+
+ await setInstance(result.url, result.username, result.password, program['default'])
+
+ process.exit(0)
})
})
program
.command('del <url>')
.description('unregisters a remote instance')
- .action((url) => {
- delInstance(url)
+ .action(async url => {
+ await delInstance(url)
+
+ process.exit(0)
})
program
.command('list')
.description('lists registered remote instances')
- .action(() => {
- getSettings()
- .then(settings => {
- const table = new Table({
- head: ['instance', 'login'],
- colWidths: [30, 30]
- })
- netrc.loadSync()
- settings.remotes.forEach(element => {
- table.push([
- element,
- netrc.machines[element].login
- ])
- })
-
- console.log(table.toString())
- })
+ .action(async () => {
+ const [ settings, netrc ] = await Promise.all([ getSettings(), getNetrc() ])
+
+ const table = new CliTable3({
+ head: [ 'instance', 'login' ],
+ colWidths: [ 30, 30 ]
+ }) as any
+
+ settings.remotes.forEach(element => {
+ if (!netrc.machines[element]) return
+
+ table.push([
+ element,
+ netrc.machines[element].login
+ ])
+ })
+
+ console.log(table.toString())
+
+ process.exit(0)
})
program
.command('set-default <url>')
.description('set an existing entry as default')
- .action((url) => {
- getSettings()
- .then(settings => {
- const instanceExists = settings.remotes.indexOf(url) !== -1
-
- if (instanceExists) {
- settings.default = settings.remotes.indexOf(url)
- writeSettings(settings)
- } else {
- console.log('<url> is not a registered instance.')
- process.exit(-1)
- }
- })
+ .action(async url => {
+ const settings = await getSettings()
+ const instanceExists = settings.remotes.includes(url)
+
+ if (instanceExists) {
+ settings.default = settings.remotes.indexOf(url)
+ await writeSettings(settings)
+
+ process.exit(0)
+ } else {
+ console.log('<url> is not a registered instance.')
+ process.exit(-1)
+ }
})
program.on('--help', function () {
console.log(' Examples:')
console.log()
- console.log(' $ peertube add -u peertube.cpy.re -U "PEERTUBE_USER" --password "PEERTUBE_PASSWORD"')
- console.log(' $ peertube add -u peertube.cpy.re -U root')
- console.log(' $ peertube list')
- console.log(' $ peertube del peertube.cpy.re')
+ console.log(' $ peertube auth add -u https://peertube.cpy.re -U "PEERTUBE_USER" --password "PEERTUBE_PASSWORD"')
+ console.log(' $ peertube auth add -u https://peertube.cpy.re -U root')
+ console.log(' $ peertube auth list')
+ console.log(' $ peertube auth del https://peertube.cpy.re')
console.log()
})
projects / github / Chocobozzz / PeerTube.git / blobdiff