aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/helpers/register-ts-paths.ts16
-rw-r--r--server/lib/client-html.ts5
-rw-r--r--server/middlewares/async.ts2
-rw-r--r--server/middlewares/validators/videos/video-playlists.ts2
-rw-r--r--server/middlewares/validators/videos/videos.ts2
-rw-r--r--server/tests/register.ts3
-rw-r--r--server/tools/cli.ts8
-rw-r--r--server/tools/peertube-auth.ts9
-rw-r--r--server/tools/peertube-get-access-token.ts3
-rw-r--r--server/tools/peertube-import-videos.ts8
-rw-r--r--server/tools/peertube-plugins.ts13
-rw-r--r--server/tools/peertube-redundancy.ts3
-rw-r--r--server/tools/peertube-upload.ts3
-rw-r--r--server/tools/peertube.ts3
-rw-r--r--server/tools/tsconfig.json9
-rw-r--r--server/types/express-handler.ts (renamed from server/types/express.ts)0
-rw-r--r--server/types/express.d.ts (renamed from server/typings/express/index.d.ts)0
17 files changed, 26 insertions, 63 deletions
diff --git a/server/helpers/register-ts-paths.ts b/server/helpers/register-ts-paths.ts
deleted file mode 100644
index eec7fed3e..000000000
--- a/server/helpers/register-ts-paths.ts
+++ /dev/null
@@ -1,16 +0,0 @@
1import { resolve } from 'path'
2import tsConfigPaths = require('tsconfig-paths')
3
4const tsConfig = require('../../tsconfig.json')
5
6function registerTSPaths () {
7 // Thanks: https://github.com/dividab/tsconfig-paths/issues/75#issuecomment-458936883
8 tsConfigPaths.register({
9 baseUrl: resolve(tsConfig.compilerOptions.baseUrl || '', tsConfig.compilerOptions.outDir || ''),
10 paths: tsConfig.compilerOptions.paths
11 })
12}
13
14export {
15 registerTSPaths
16}
diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts
index e7e439bfe..74788af52 100644
--- a/server/lib/client-html.ts
+++ b/server/lib/client-html.ts
@@ -3,6 +3,7 @@ import { readFile } from 'fs-extra'
3import { join } from 'path' 3import { join } from 'path'
4import validator from 'validator' 4import validator from 'validator'
5import { toCompleteUUID } from '@server/helpers/custom-validators/misc' 5import { toCompleteUUID } from '@server/helpers/custom-validators/misc'
6import { root } from '@shared/core-utils'
6import { escapeHTML } from '@shared/core-utils/renderer' 7import { escapeHTML } from '@shared/core-utils/renderer'
7import { sha256 } from '@shared/extra-utils' 8import { sha256 } from '@shared/extra-utils'
8import { HTMLServerConfig } from '@shared/models' 9import { HTMLServerConfig } from '@shared/models'
@@ -344,11 +345,11 @@ class ClientHtml {
344 { cookie: req.cookies?.clientLanguage, paramLang, acceptLanguage: req.headers['accept-language'] } 345 { cookie: req.cookies?.clientLanguage, paramLang, acceptLanguage: req.headers['accept-language'] }
345 ) 346 )
346 347
347 return join(__dirname, '../../../client/dist/' + buildFileLocale(lang) + '/index.html') 348 return join(root(), 'client', 'dist', buildFileLocale(lang), 'index.html')
348 } 349 }
349 350
350 private static getEmbedPath () { 351 private static getEmbedPath () {
351 return join(__dirname, '../../../client/dist/standalone/videos/embed.html') 352 return join(root(), 'client', 'dist', 'standalone', 'videos', 'embed.html')
352 } 353 }
353 354
354 private static addManifestContentHash (htmlStringPage: string) { 355 private static addManifestContentHash (htmlStringPage: string) {
diff --git a/server/middlewares/async.ts b/server/middlewares/async.ts
index 3d6e38809..9d0193536 100644
--- a/server/middlewares/async.ts
+++ b/server/middlewares/async.ts
@@ -1,7 +1,7 @@
1import { eachSeries } from 'async' 1import { eachSeries } from 'async'
2import { NextFunction, Request, RequestHandler, Response } from 'express' 2import { NextFunction, Request, RequestHandler, Response } from 'express'
3import { ValidationChain } from 'express-validator' 3import { ValidationChain } from 'express-validator'
4import { ExpressPromiseHandler } from '@server/types/express' 4import { ExpressPromiseHandler } from '@server/types/express-handler'
5import { retryTransactionWrapper } from '../helpers/database-utils' 5import { retryTransactionWrapper } from '../helpers/database-utils'
6 6
7// Syntactic sugar to avoid try/catch in express controllers 7// Syntactic sugar to avoid try/catch in express controllers
diff --git a/server/middlewares/validators/videos/video-playlists.ts b/server/middlewares/validators/videos/video-playlists.ts
index ec5a3a9c8..f5fee845e 100644
--- a/server/middlewares/validators/videos/video-playlists.ts
+++ b/server/middlewares/validators/videos/video-playlists.ts
@@ -1,6 +1,6 @@
1import express from 'express' 1import express from 'express'
2import { body, param, query, ValidationChain } from 'express-validator' 2import { body, param, query, ValidationChain } from 'express-validator'
3import { ExpressPromiseHandler } from '@server/types/express' 3import { ExpressPromiseHandler } from '@server/types/express-handler'
4import { MUserAccountId } from '@server/types/models' 4import { MUserAccountId } from '@server/types/models'
5import { 5import {
6 HttpStatusCode, 6 HttpStatusCode,
diff --git a/server/middlewares/validators/videos/videos.ts b/server/middlewares/validators/videos/videos.ts
index 1e727533b..bf5f1c97b 100644
--- a/server/middlewares/validators/videos/videos.ts
+++ b/server/middlewares/validators/videos/videos.ts
@@ -5,7 +5,7 @@ import { getResumableUploadPath } from '@server/helpers/upload'
5import { Redis } from '@server/lib/redis' 5import { Redis } from '@server/lib/redis'
6import { isAbleToUploadVideo } from '@server/lib/user' 6import { isAbleToUploadVideo } from '@server/lib/user'
7import { getServerActor } from '@server/models/application/application' 7import { getServerActor } from '@server/models/application/application'
8import { ExpressPromiseHandler } from '@server/types/express' 8import { ExpressPromiseHandler } from '@server/types/express-handler'
9import { MUserAccountId, MVideoFullLight } from '@server/types/models' 9import { MUserAccountId, MVideoFullLight } from '@server/types/models'
10import { getAllPrivacies } from '@shared/core-utils' 10import { getAllPrivacies } from '@shared/core-utils'
11import { HttpStatusCode, ServerErrorCode, UserRight, VideoInclude, VideoPrivacy } from '@shared/models' 11import { HttpStatusCode, ServerErrorCode, UserRight, VideoInclude, VideoPrivacy } from '@shared/models'
diff --git a/server/tests/register.ts b/server/tests/register.ts
deleted file mode 100644
index af6c8c644..000000000
--- a/server/tests/register.ts
+++ /dev/null
@@ -1,3 +0,0 @@
1import { registerTSPaths } from '../helpers/register-ts-paths'
2
3registerTSPaths()
diff --git a/server/tools/cli.ts b/server/tools/cli.ts
index 00adcedeb..a844b9dcf 100644
--- a/server/tools/cli.ts
+++ b/server/tools/cli.ts
@@ -2,19 +2,19 @@ import { Command } from 'commander'
2import { Netrc } from 'netrc-parser' 2import { Netrc } from 'netrc-parser'
3import { join } from 'path' 3import { join } from 'path'
4import { createLogger, format, transports } from 'winston' 4import { createLogger, format, transports } from 'winston'
5import { PeerTubeServer } from '@shared/server-commands' 5import { loadLanguages } from '@server/initializers/constants'
6import { root } from '@shared/core-utils'
6import { UserRole } from '@shared/models' 7import { UserRole } from '@shared/models'
8import { PeerTubeServer } from '@shared/server-commands'
7import { VideoPrivacy } from '../../shared/models/videos' 9import { VideoPrivacy } from '../../shared/models/videos'
8import { getAppNumber, isTestInstance } from '../helpers/core-utils' 10import { getAppNumber, isTestInstance } from '../helpers/core-utils'
9import { root } from '@shared/core-utils'
10import { loadLanguages } from '@server/initializers/constants'
11 11
12let configName = 'PeerTube/CLI' 12let configName = 'PeerTube/CLI'
13if (isTestInstance()) configName += `-${getAppNumber()}` 13if (isTestInstance()) configName += `-${getAppNumber()}`
14 14
15const config = require('application-config')(configName) 15const config = require('application-config')(configName)
16 16
17const version = require('../../../package.json').version 17const version = require(join(root(), 'package.json')).version
18 18
19async function getAdminTokenOrDie (server: PeerTubeServer, username: string, password: string) { 19async function getAdminTokenOrDie (server: PeerTubeServer, username: string, password: string) {
20 const token = await server.login.getAccessToken(username, password) 20 const token = await server.login.getAccessToken(username, password)
diff --git a/server/tools/peertube-auth.ts b/server/tools/peertube-auth.ts
index afa19ee08..f8ac8b2ab 100644
--- a/server/tools/peertube-auth.ts
+++ b/server/tools/peertube-auth.ts
@@ -1,12 +1,7 @@
1// eslint-disable @typescript-eslint/no-unnecessary-type-assertion 1import CliTable3 from 'cli-table3'
2
3import { registerTSPaths } from '../helpers/register-ts-paths'
4registerTSPaths()
5
6import { OptionValues, program } from 'commander' 2import { OptionValues, program } from 'commander'
7import { assignToken, buildServer, getNetrc, getSettings, writeSettings } from './cli'
8import { isUserUsernameValid } from '../helpers/custom-validators/users' 3import { isUserUsernameValid } from '../helpers/custom-validators/users'
9import CliTable3 from 'cli-table3' 4import { assignToken, buildServer, getNetrc, getSettings, writeSettings } from './cli'
10 5
11import prompt = require('prompt') 6import prompt = require('prompt')
12 7
diff --git a/server/tools/peertube-get-access-token.ts b/server/tools/peertube-get-access-token.ts
index a67de9180..d59a3632e 100644
--- a/server/tools/peertube-get-access-token.ts
+++ b/server/tools/peertube-get-access-token.ts
@@ -1,6 +1,3 @@
1import { registerTSPaths } from '../helpers/register-ts-paths'
2registerTSPaths()
3
4import { program } from 'commander' 1import { program } from 'commander'
5import { assignToken, buildServer } from './cli' 2import { assignToken, buildServer } from './cli'
6 3
diff --git a/server/tools/peertube-import-videos.ts b/server/tools/peertube-import-videos.ts
index 87aec60ef..661a4cf35 100644
--- a/server/tools/peertube-import-videos.ts
+++ b/server/tools/peertube-import-videos.ts
@@ -1,12 +1,10 @@
1import { registerTSPaths } from '../helpers/register-ts-paths'
2registerTSPaths()
3
4import { program } from 'commander' 1import { program } from 'commander'
5import { accessSync, constants } from 'fs' 2import { accessSync, constants } from 'fs'
6import { remove } from 'fs-extra' 3import { remove } from 'fs-extra'
7import { join } from 'path' 4import { join } from 'path'
8import { sha256 } from '@shared/extra-utils' 5import { YoutubeDLCLI, YoutubeDLInfo, YoutubeDLInfoBuilder } from '@server/helpers/youtube-dl'
9import { wait } from '@shared/core-utils' 6import { wait } from '@shared/core-utils'
7import { sha256 } from '@shared/extra-utils'
10import { doRequestAndSaveToFile } from '../helpers/requests' 8import { doRequestAndSaveToFile } from '../helpers/requests'
11import { 9import {
12 assignToken, 10 assignToken,
@@ -16,7 +14,7 @@ import {
16 getLogger, 14 getLogger,
17 getServerCredentials 15 getServerCredentials
18} from './cli' 16} from './cli'
19import { YoutubeDLCLI, YoutubeDLInfo, YoutubeDLInfoBuilder } from '@server/helpers/youtube-dl' 17
20import prompt = require('prompt') 18import prompt = require('prompt')
21 19
22const processOptions = { 20const processOptions = {
diff --git a/server/tools/peertube-plugins.ts b/server/tools/peertube-plugins.ts
index 9dd3f08c9..47090b3a5 100644
--- a/server/tools/peertube-plugins.ts
+++ b/server/tools/peertube-plugins.ts
@@ -1,13 +1,8 @@
1// eslint-disable @typescript-eslint/no-unnecessary-type-assertion
2
3import { registerTSPaths } from '../helpers/register-ts-paths'
4registerTSPaths()
5
6import { program, Command, OptionValues } from 'commander'
7import { assignToken, buildServer, getServerCredentials } from './cli'
8import { PluginType } from '../../shared/models'
9import { isAbsolute } from 'path'
10import CliTable3 from 'cli-table3' 1import CliTable3 from 'cli-table3'
2import { Command, OptionValues, program } from 'commander'
3import { isAbsolute } from 'path'
4import { PluginType } from '../../shared/models'
5import { assignToken, buildServer, getServerCredentials } from './cli'
11 6
12program 7program
13 .name('plugins') 8 .name('plugins')
diff --git a/server/tools/peertube-redundancy.ts b/server/tools/peertube-redundancy.ts
index 12c412b67..2c62a3c19 100644
--- a/server/tools/peertube-redundancy.ts
+++ b/server/tools/peertube-redundancy.ts
@@ -1,6 +1,3 @@
1import { registerTSPaths } from '../helpers/register-ts-paths'
2registerTSPaths()
3
4import CliTable3 from 'cli-table3' 1import CliTable3 from 'cli-table3'
5import { Command, program } from 'commander' 2import { Command, program } from 'commander'
6import { uniq } from 'lodash' 3import { uniq } from 'lodash'
diff --git a/server/tools/peertube-upload.ts b/server/tools/peertube-upload.ts
index 01fb1fe8d..08bd5f2bb 100644
--- a/server/tools/peertube-upload.ts
+++ b/server/tools/peertube-upload.ts
@@ -1,6 +1,3 @@
1import { registerTSPaths } from '../helpers/register-ts-paths'
2registerTSPaths()
3
4import { program } from 'commander' 1import { program } from 'commander'
5import { access, constants } from 'fs-extra' 2import { access, constants } from 'fs-extra'
6import { isAbsolute } from 'path' 3import { isAbsolute } from 'path'
diff --git a/server/tools/peertube.ts b/server/tools/peertube.ts
index 9e07640f0..1d3158044 100644
--- a/server/tools/peertube.ts
+++ b/server/tools/peertube.ts
@@ -1,8 +1,5 @@
1#!/usr/bin/env node 1#!/usr/bin/env node
2 2
3import { registerTSPaths } from '../helpers/register-ts-paths'
4registerTSPaths()
5
6import { CommandOptions, program } from 'commander' 3import { CommandOptions, program } from 'commander'
7import { getSettings, version } from './cli' 4import { getSettings, version } from './cli'
8 5
diff --git a/server/tools/tsconfig.json b/server/tools/tsconfig.json
index 61e6b8739..8264f5b35 100644
--- a/server/tools/tsconfig.json
+++ b/server/tools/tsconfig.json
@@ -1,11 +1,16 @@
1{ 1{
2 "extends": "../../tsconfig.json", 2 "extends": "../../tsconfig.json",
3 "compilerOptions": { 3 "compilerOptions": {
4 "outDir": "../../dist/server/tools" 4 "baseUrl": "./",
5 "outDir": "../../dist/server/tools",
6 "paths": { // FIXME: https://github.com/benyap/resolve-tspaths/issues/10
7 "@server/*": [ "../../server/*" ],
8 "@shared/*": [ "../../shared/*" ]
9 }
5 }, 10 },
6 "include": [ ".", "../typings" ], 11 "include": [ ".", "../typings" ],
7 "references": [ 12 "references": [
8 { "path": "../" }, 13 { "path": "../" }
9 ], 14 ],
10 "files": [], 15 "files": [],
11 "exclude": [ ] // Overwrite exclude property 16 "exclude": [ ] // Overwrite exclude property
diff --git a/server/types/express.ts b/server/types/express-handler.ts
index e72be36e4..e72be36e4 100644
--- a/server/types/express.ts
+++ b/server/types/express-handler.ts
diff --git a/server/typings/express/index.d.ts b/server/types/express.d.ts
index 1a99b598a..1a99b598a 100644
--- a/server/typings/express/index.d.ts
+++ b/server/types/express.d.ts