import autocannon, { printResult } from 'autocannon'
import { writeJson } from 'fs-extra'
-import { createSingleServer, killallServers, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils'
+import { createSingleServer, killallServers, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands'
import { Video, VideoPrivacy } from '@shared/models'
let server: PeerTubeServer
import { registerTSPaths } from '../server/helpers/register-ts-paths'
registerTSPaths()
-import { CLICommand } from '@shared/extra-utils'
+import { CLICommand } from '@shared/server-commands'
run()
.then(() => process.exit(0))
setAccessTokensToServers,
wait,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
const expect = chai.expect
PeerTubeServer,
setAccessTokensToServers,
setDefaultVideoChannel
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoPlaylistPrivacy } from '@shared/models'
const expect = chai.expect
import 'mocha'
import * as chai from 'chai'
-import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils'
+import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'
const expect = chai.expect
import 'mocha'
import { expect } from 'chai'
import { cloneDeep } from 'lodash'
-import { buildAbsoluteFixturePath, buildRequestStub } from '@shared/extra-utils'
+import { buildAbsoluteFixturePath, buildRequestStub } from '@shared/server-commands'
import { buildSignedActivity } from '../../../helpers/activitypub'
import { isHTTPSignatureVerified, isJsonLDSignatureVerified, parseHTTPSignature } from '../../../helpers/peertube-crypto'
setDefaultVideoChannel,
wait,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoPlaylistPrivacy } from '@shared/models'
describe('Test AP refresher', function () {
import { buildDigest } from '@server/helpers/peertube-crypto'
import { HTTP_SIGNATURE } from '@server/initializers/constants'
import { buildGlobalHeaders } from '@server/lib/job-queue/handlers/utils/activitypub-http-utils'
-import { buildAbsoluteFixturePath, cleanupTests, createMultipleServers, killallServers, PeerTubeServer, wait } from '@shared/extra-utils'
+import { buildAbsoluteFixturePath, cleanupTests, createMultipleServers, killallServers, PeerTubeServer, wait } from '@shared/server-commands'
import { makeFollowRequest, makePOSTAPRequest } from '@server/tests/shared'
import { HttpStatusCode } from '@shared/models'
PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { AbuseCreate, AbuseState, HttpStatusCode } from '@shared/models'
describe('Test abuses API validators', function () {
cleanupTests,
createSingleServer,
PeerTubeServer
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
describe('Test accounts API validators', function () {
makePostBodyRequest,
PeerTubeServer,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
describe('Test blocklist API validators', function () {
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
import 'mocha'
-import { cleanupTests, createSingleServer, makePostBodyRequest, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, makePostBodyRequest, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
describe('Test bulk API validators', function () {
makePutBodyRequest,
PeerTubeServer,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { CustomConfig, HttpStatusCode } from '@shared/models'
describe('Test config API validators', function () {
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
import 'mocha'
-import { cleanupTests, createSingleServer, killallServers, MockSmtpServer, PeerTubeServer } from '@shared/extra-utils'
-import { ContactFormCommand } from '@shared/extra-utils/server'
import { HttpStatusCode } from '@shared/models'
+import {
+ cleanupTests,
+ ContactFormCommand,
+ createSingleServer,
+ killallServers,
+ MockSmtpServer,
+ PeerTubeServer
+} from '@shared/server-commands'
describe('Test contact form API validators', function () {
let server: PeerTubeServer
makePutBodyRequest,
PeerTubeServer,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
describe('Test custom pages validators', function () {
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
import 'mocha'
-import { cleanupTests, createSingleServer, makeGetRequest, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, makeGetRequest, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
describe('Test debug API validators', function () {
makePostBodyRequest,
PeerTubeServer,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
describe('Test server follows API validators', function () {
makeGetRequest,
PeerTubeServer,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
describe('Test jobs API validators', function () {
sendRTMPStream,
setAccessTokensToServers,
stopFfmpeg
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoCreateResult, VideoPrivacy } from '@shared/models'
describe('Test video lives API validator', function () {
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
import 'mocha'
-import { cleanupTests, createSingleServer, makeGetRequest, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, makeGetRequest, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
describe('Test logs API validators', function () {
PeerTubeServer,
setAccessTokensToServers,
UsersCommand
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, UserRole, VideoCreateResult } from '@shared/models'
describe('Test my user API validators', function () {
makePutBodyRequest,
PeerTubeServer,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, PeerTubePlugin, PluginType } from '@shared/models'
describe('Test server plugins API validators', function () {
PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoCreateResult } from '@shared/models'
describe('Test server redundancy API validators', function () {
makeGetRequest,
PeerTubeServer,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
function updateSearchIndex (server: PeerTubeServer, enabled: boolean, disableLocalSearch = false) {
PeerTubeServer,
setAccessTokensToServers,
setDefaultVideoChannel
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoPlaylistPrivacy } from '@shared/models'
describe('Test services API validators', function () {
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
import 'mocha'
-import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils'
+import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'
import { HttpStatusCode, UserRole } from '@shared/models'
describe('Test transcoding API validators', function () {
setDefaultVideoChannel,
VideosCommand,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoImportState, VideoPrivacy } from '@shared/models'
describe('Test upload quota', function () {
PeerTubeServer,
setAccessTokensToServers,
wait
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, UserNotificationSetting, UserNotificationSettingValue } from '@shared/models'
describe('Test user notifications API validators', function () {
PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
describe('Test user subscriptions API validators', function () {
MockSmtpServer,
PeerTubeServer,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, UserAdminFlag, UserRole } from '@shared/models'
describe('Test users admin API validators', function () {
MockSmtpServer,
PeerTubeServer,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, UserRole } from '@shared/models'
describe('Test users API validators', function () {
PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoBlacklistType } from '@shared/models'
describe('Test video blacklist API validators', function () {
makeUploadRequest,
PeerTubeServer,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoCreateResult } from '@shared/models'
describe('Test video captions API validator', function () {
makeUploadRequest,
PeerTubeServer,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoChannelUpdate } from '@shared/models'
const expect = chai.expect
makePostBodyRequest,
PeerTubeServer,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoCreateResult } from '@shared/models'
const expect = chai.expect
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
import 'mocha'
-import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils'
+import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'
import { HttpStatusCode, UserRole } from '@shared/models'
describe('Test videos files', function () {
makeUploadRequest,
PeerTubeServer,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoPrivacy } from '@shared/models'
describe('Test video imports API validator', function () {
PlaylistsCommand,
setAccessTokensToServers,
setDefaultVideoChannel
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import {
HttpStatusCode,
VideoPlaylistCreate,
PeerTubeServer,
setAccessTokensToServers,
setDefaultVideoChannel
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, UserRole, VideoInclude, VideoPrivacy } from '@shared/models'
describe('Test video filters validators', function () {
makePutBodyRequest,
PeerTubeServer,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
describe('Test videos history API validator', function () {
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
import 'mocha'
-import { cleanupTests, createSingleServer, PeerTubeServer } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, PeerTubeServer } from '@shared/server-commands'
describe('Test videos overview', function () {
let server: PeerTubeServer
PeerTubeServer,
root,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, PeerTubeProblemDocument, VideoCreateResult, VideoPrivacy } from '@shared/models'
const expect = chai.expect
setDefaultVideoChannel,
wait,
waitJobs
-} from '../../../../shared/extra-utils'
+} from '../../../../shared/server-commands'
const expect = chai.expect
stopFfmpeg,
wait,
waitJobs
-} from '../../../../shared/extra-utils'
+} from '../../../../shared/server-commands'
const expect = chai.expect
stopFfmpeg,
testFfmpegStreamError,
waitUntilLivePublishedOnAllServers
-} from '../../../../shared/extra-utils'
+} from '../../../../shared/server-commands'
const expect = chai.expect
waitJobs,
waitUntilLivePublishedOnAllServers,
waitUntilLiveSavedOnAllServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, LiveVideoCreate, VideoPrivacy, VideoState } from '@shared/models'
const expect = chai.expect
wait,
waitJobs,
waitUntilLivePublishedOnAllServers
-} from '../../../../shared/extra-utils'
+} from '../../../../shared/server-commands'
const expect = chai.expect
wait,
waitJobs,
waitUntilLivePublishedOnAllServers
-} from '../../../../shared/extra-utils'
+} from '../../../../shared/server-commands'
const expect = chai.expect
wait,
waitJobs,
waitUntilLivePublishedOnAllServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import {
HttpStatusCode,
LiveVideo,
PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { AbuseMessage, AbusePredefinedReasonsString, AbuseState, AdminAbuse, UserAbuse } from '@shared/models'
const expect = chai.expect
import 'mocha'
import * as chai from 'chai'
-import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils'
+import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'
import { UserNotificationType } from '@shared/models'
const expect = chai.expect
PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { UserNotificationType } from '@shared/models'
const expect = chai.expect
PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { UserAdminFlag, UserRole, VideoBlacklist, VideoBlacklistType } from '@shared/models'
const expect = chai.expect
PeerTubeServer,
prepareNotificationsTest,
wait
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { PluginType, UserNotification, UserNotificationType } from '@shared/models'
describe('Test admin notifications', function () {
PeerTubeServer,
prepareNotificationsTest,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { UserNotification } from '@shared/models'
const expect = chai.expect
prepareNotificationsTest,
wait,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { AbuseState, CustomConfig, UserNotification, UserRole, VideoPrivacy } from '@shared/models'
describe('Test moderation notifications', function () {
PeerTubeServer,
prepareNotificationsTest,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { UserNotification, UserNotificationSettingValue } from '@shared/models'
const expect = chai.expect
uploadRandomVideoOnServers,
wait,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { UserNotification, UserNotificationType, VideoPrivacy } from '@shared/models'
const expect = chai.expect
waitJobs,
waitUntilLivePublishedOnAllServers,
waitUntilLiveSavedOnAllServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, LiveVideoCreate, VideoFile, VideoPrivacy } from '@shared/models'
const expect = chai.expect
setAccessTokensToServers,
setDefaultVideoChannel,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoPrivacy } from '@shared/models'
const expect = chai.expect
setAccessTokensToServers,
waitJobs,
webtorrentAdd
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoDetails } from '@shared/models'
const expect = chai.expect
RedundancyCommand,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { VideoPrivacy, VideoRedundanciesTarget } from '@shared/models'
const expect = chai.expect
import 'mocha'
import { expect } from 'chai'
-import { cleanupTests, createSingleServer, killallServers, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, killallServers, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'
import { VideoPrivacy } from '@shared/models'
describe('Test redundancy constraints', function () {
setAccessTokensToServers,
wait,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import {
HttpStatusCode,
VideoDetails,
setAccessTokensToServers,
wait,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { VideoChannel } from '@shared/models'
const expect = chai.expect
setDefaultVideoChannel,
wait,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { VideoPlaylistPrivacy } from '@shared/models'
const expect = chai.expect
setAccessTokensToServers,
wait,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { VideoPrivacy } from '@shared/models'
const expect = chai.expect
PeerTubeServer,
SearchCommand,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { VideoChannel } from '@shared/models'
const expect = chai.expect
import 'mocha'
import * as chai from 'chai'
-import { cleanupTests, createSingleServer, PeerTubeServer, SearchCommand, setAccessTokensToServers } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, PeerTubeServer, SearchCommand, setAccessTokensToServers } from '@shared/server-commands'
import {
BooleanBothQuery,
VideoChannelsSearchQuery,
SearchCommand,
setAccessTokensToServers,
setDefaultVideoChannel
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { VideoPlaylistPrivacy } from '@shared/models'
const expect = chai.expect
setDefaultVideoChannel,
stopFfmpeg,
wait
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { VideoPrivacy } from '@shared/models'
const expect = chai.expect
setAccessTokensToServers,
wait,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
const expect = chai.expect
PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
const expect = chai.expect
PeerTubeServer,
setAccessTokensToServers,
setDefaultVideoChannel
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { VideoDetails, VideoPrivacy } from '@shared/models'
const expect = chai.expect
parallelTests,
PeerTubeServer,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { CustomConfig, HttpStatusCode } from '@shared/models'
const expect = chai.expect
setAccessTokensToServers,
wait,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
const expect = chai.expect
import 'mocha'
import * as chai from 'chai'
-import { cleanupTests, createSingleServer, MockSmtpServer, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, MockSmtpServer, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
const expect = chai.expect
import 'mocha'
import * as chai from 'chai'
-import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils'
+import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands'
import { HttpStatusCode, PeerTubeProblemDocument, ServerErrorCode } from '@shared/models'
const expect = chai.expect
PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
const expect = chai.expect
setAccessTokensToServers,
testCaptionFile,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { VideoCreateResult, VideoPrivacy } from '@shared/models'
import { completeVideoCheck } from '@server/tests/shared/video'
setAccessTokensToServers,
wait,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, JobState, VideoCreateResult, VideoPrivacy } from '@shared/models'
import { completeVideoCheck } from '@server/tests/shared/video'
killallServers,
PeerTubeServer,
setAccessTokensToServers
-} from '../../../../shared/extra-utils/index'
+} from '../../../../shared/server-commands/index'
const expect = chai.expect
PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
const expect = chai.expect
PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
const expect = chai.expect
import 'mocha'
import request from 'supertest'
-import { cleanupTests, createSingleServer, PeerTubeServer } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, PeerTubeServer } from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
describe('Start and stop server without web client routes', function () {
setAccessTokensToServers,
testHelloWorldRegisteredSettings,
wait
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, PluginType } from '@shared/models'
const expect = chai.expect
setAccessTokensToServers,
setDefaultVideoChannel,
waitJobs
-} from '@shared/extra-utils'
-import { MockProxy } from '@shared/extra-utils/mock-servers/mock-proxy'
+} from '@shared/server-commands'
+import { MockProxy } from '@shared/server-commands/mock-servers/mock-proxy'
import { HttpStatusCode, VideoPrivacy } from '@shared/models'
const expect = chai.expect
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
import { expect } from 'chai'
-import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, wait } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, wait } from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
describe('Test application behind a reverse proxy', function () {
import 'mocha'
import * as chai from 'chai'
-import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, setDefaultVideoChannel } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, setDefaultVideoChannel } from '@shared/server-commands'
import { Video, VideoPlaylistPrivacy } from '@shared/models'
const expect = chai.expect
import 'mocha'
import * as chai from 'chai'
-import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils'
+import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'
import { Job } from '@shared/models'
const expect = chai.expect
setAccessTokensToServers,
wait,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { ActivityType, VideoPlaylistPrivacy } from '@shared/models'
const expect = chai.expect
import 'mocha'
import magnetUtil from 'magnet-uri'
import WebTorrent from 'webtorrent'
-import { cleanupTests, createSingleServer, killallServers, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, killallServers, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands'
describe('Test tracker', function () {
let server: PeerTubeServer
setAccessTokensToServers,
SubscriptionsCommand,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
const expect = chai.expect
setAccessTokensToServers,
testImage,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { MyUser } from '@shared/models'
const expect = chai.expect
import 'mocha'
import * as chai from 'chai'
-import { cleanupTests, createSingleServer, MockSmtpServer, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, MockSmtpServer, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
const expect = chai.expect
setAccessTokensToServers,
testImage,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { AbuseState, HttpStatusCode, OAuth2ErrorCode, UserAdminFlag, UserRole, Video, VideoPlaylistType } from '@shared/models'
const expect = chai.expect
import 'mocha'
import * as chai from 'chai'
import { getAudioStream, getVideoStreamSize } from '@server/helpers/ffprobe-utils'
-import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils'
+import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'
const expect = chai.expect
wait,
waitJobs,
webtorrentAdd
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoCommentThreadTree, VideoPrivacy } from '@shared/models'
import { completeVideoCheck } from '@server/tests/shared/video'
PeerTubeServer,
setAccessTokensToServers,
setDefaultVideoChannel
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoPrivacy } from '@shared/models'
const expect = chai.expect
setAccessTokensToServers,
testImage,
wait
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { Video, VideoPrivacy } from '@shared/models'
import { completeVideoCheck } from '@server/tests/shared/video'
testCaptionFile,
wait,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
const expect = chai.expect
setAccessTokensToServers,
setDefaultVideoChannel,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoPrivacy } from '@shared/models'
const expect = chai.expect
testImage,
wait,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { User, VideoChannel } from '@shared/models'
const expect = chai.expect
PeerTubeServer,
setAccessTokensToServers,
testImage
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
const expect = chai.expect
PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoDetails } from '@shared/models'
const expect = chai.expect
import 'mocha'
import * as chai from 'chai'
-import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils'
+import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'
const expect = chai.expect
import 'mocha'
import { expect } from 'chai'
-import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils'
+import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'
describe('Test videos files', function () {
let servers: PeerTubeServer[]
setAccessTokensToServers,
waitJobs,
webtorrentAdd
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoStreamingPlaylistType } from '@shared/models'
import { DEFAULT_AUDIO_RESOLUTION } from '../../../initializers/constants'
testCaptionFile,
testImage,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { VideoPrivacy, VideoResolution } from '@shared/models'
async function checkVideosServer1 (server: PeerTubeServer, idHttp: string, idMagnet: string, idTorrent: string) {
import 'mocha'
import * as chai from 'chai'
-import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands'
import { BooleanBothQuery, CustomConfig, ResultList, Video, VideosOverview } from '@shared/models'
const expect = chai.expect
setDefaultVideoChannel,
testImage,
waitJobs
-} from '../../../../shared/extra-utils'
+} from '../../../../shared/server-commands'
import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model'
const expect = chai.expect
testImage,
wait,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import {
HttpStatusCode,
VideoPlaylist,
setAccessTokensToServers,
wait,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoCreateResult, VideoPrivacy } from '@shared/models'
const expect = chai.expect
setAccessTokensToServers,
wait,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { VideoPrivacy } from '@shared/models'
const expect = chai.expect
setAccessTokensToServers,
waitJobs,
webtorrentAdd
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoState } from '@shared/models'
import {
canDoQuickTranscode,
setAccessTokensToServers,
setDefaultVideoChannel,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, UserRole, Video, VideoDetails, VideoInclude, VideoPrivacy } from '@shared/models'
describe('Test videos filter', function () {
PeerTubeServer,
setAccessTokensToServers,
wait
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, Video } from '@shared/models'
const expect = chai.expect
import 'mocha'
import * as chai from 'chai'
-import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, wait } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, wait } from '@shared/server-commands'
import { VideosOverview } from '@shared/models'
const expect = chai.expect
setAccessTokensToServers,
wait,
waitJobs
-} from '../../../../shared/extra-utils'
+} from '../../../../shared/server-commands'
const expect = chai.expect
PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoDetails, VideoFile, VideoInclude } from '@shared/models'
const expect = chai.expect
PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoDetails } from '@shared/models'
async function checkFiles (origin: PeerTubeServer, video: VideoDetails, inObjectStorage: boolean) {
PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '../../../shared/extra-utils'
+} from '../../../shared/server-commands'
const expect = chai.expect
setAccessTokensToServers,
testHelloWorldRegisteredSettings,
waitJobs
-} from '../../../shared/extra-utils'
+} from '../../../shared/server-commands'
describe('Test CLI wrapper', function () {
let server: PeerTubeServer
PeerTubeServer,
PluginsCommand,
setAccessTokensToServers
-} from '../../../shared/extra-utils'
+} from '../../../shared/server-commands'
describe('Test plugin scripts', function () {
let server: PeerTubeServer
import 'mocha'
import * as chai from 'chai'
-import { buildAbsoluteFixturePath, CLICommand } from '@shared/extra-utils'
+import { buildAbsoluteFixturePath, CLICommand } from '@shared/server-commands'
import { VideoResolution } from '../../../shared/models/videos'
const expect = chai.expect
setDefaultVideoChannel,
wait,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoPlaylistPrivacy } from '@shared/models'
const expect = chai.expect
PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '../../../shared/extra-utils'
+} from '../../../shared/server-commands'
async function testThumbnail (server: PeerTubeServer, videoId: number | string) {
const video = await server.videos.get({ id: videoId })
import 'mocha'
-import { cleanupTests, CLICommand, createSingleServer, PeerTubeServer, setAccessTokensToServers } from '../../../shared/extra-utils'
+import { cleanupTests, CLICommand, createSingleServer, PeerTubeServer, setAccessTokensToServers } from '../../../shared/server-commands'
describe('Test reset password scripts', function () {
let server: PeerTubeServer
PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
describe('Test update host scripts', function () {
let server: PeerTubeServer
setAccessTokensToServers,
setDefaultVideoChannel,
waitJobs
-} from '../../shared/extra-utils'
+} from '../../shared/server-commands'
const expect = chai.expect
import 'mocha'
import { expect } from 'chai'
-import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
describe('Official plugin auth-ldap', function () {
PeerTubeServer,
setAccessTokensToServers,
wait
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { Video } from '@shared/models'
async function check (server: PeerTubeServer, videoUUID: string, exists = true) {
PeerTubeServer,
setAccessTokensToServers,
wait
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
describe('Official plugin auto-mute', function () {
PeerTubeServer,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoPrivacy } from '@shared/models'
chai.use(require('chai-xml'))
import { readFile, remove } from 'fs-extra'
import { join } from 'path'
import { processImage } from '../../../server/helpers/image-utils'
-import { buildAbsoluteFixturePath, root } from '../../../shared/extra-utils'
+import { buildAbsoluteFixturePath, root } from '../../../shared/server-commands'
async function checkBuffers (path1: string, path2: string, equals: boolean) {
const [ buf1, buf2 ] = await Promise.all([
import { expect } from 'chai'
import { pathExists, remove } from 'fs-extra'
import { join } from 'path'
-import { Mock429 } from '@shared/extra-utils/mock-servers/mock-429'
-import { FIXTURE_URLS, root, wait } from '../../../shared/extra-utils'
+import { Mock429 } from '@shared/server-commands/mock-servers/mock-429'
+import { FIXTURE_URLS, root, wait } from '../../../shared/server-commands'
import { doRequest, doRequestAndSaveToFile } from '../../helpers/requests'
describe('Request helpers', function () {
import 'mocha'
import * as chai from 'chai'
-import { cleanupTests, createSingleServer, makeGetRequest, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, makeGetRequest, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands'
import { HttpStatusCode, VideoPrivacy } from '@shared/models'
const expect = chai.expect
PluginsCommand,
setAccessTokensToServers,
setDefaultVideoChannel
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { ServerHookName, VideoPlaylistPrivacy, VideoPrivacy } from '@shared/models'
describe('Test plugin action hooks', function () {
PluginsCommand,
setAccessTokensToServers,
wait
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, UserRole } from '@shared/models'
async function loginExternal (options: {
setAccessTokensToServers,
setDefaultVideoChannel,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoDetails, VideoImportState, VideoPlaylist, VideoPlaylistPrivacy, VideoPrivacy } from '@shared/models'
const expect = chai.expect
PeerTubeServer,
PluginsCommand,
setAccessTokensToServers
-} from '../../../shared/extra-utils'
+} from '../../../shared/server-commands'
const expect = chai.expect
import 'mocha'
import { expect } from 'chai'
-import { cleanupTests, createSingleServer, PeerTubeServer, PluginsCommand, setAccessTokensToServers, wait } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, PeerTubeServer, PluginsCommand, setAccessTokensToServers, wait } from '@shared/server-commands'
import { HttpStatusCode, UserRole } from '@shared/models'
describe('Test id and pass auth plugins', function () {
PluginsCommand,
setAccessTokensToServers,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, ThumbnailType } from '@shared/models'
function postCommand (server: PeerTubeServer, command: string, bodyArg?: object) {
PeerTubeServer,
PluginsCommand,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
describe('Test plugin helpers', function () {
PeerTubeServer,
PluginsCommand,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
describe('Test plugin storage', function () {
setDefaultVideoChannel,
testFfmpegStreamError,
waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { VideoPrivacy } from '@shared/models'
async function createLiveWrapper (server: PeerTubeServer) {
PeerTubeServer,
PluginsCommand,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode } from '@shared/models'
describe('Test plugins module unloading', function () {
import 'mocha'
import * as chai from 'chai'
-import { cleanupTests, createSingleServer, PeerTubeServer, PluginsCommand, setAccessTokensToServers } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, PeerTubeServer, PluginsCommand, setAccessTokensToServers } from '@shared/server-commands'
const expect = chai.expect
PeerTubeServer,
PluginsCommand,
setAccessTokensToServers
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
import { HttpStatusCode, VideoPlaylistPrivacy } from '@shared/models'
const expect = chai.expect
/* eslint-disable @typescript-eslint/no-unused-expressions */
-import { dateIsValid, makeRawRequest, PeerTubeServer, testImage, webtorrentAdd } from '@shared/extra-utils'
+import { dateIsValid, makeRawRequest, PeerTubeServer, testImage, webtorrentAdd } from '@shared/server-commands'
import { expect } from 'chai'
import { loadLanguages, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '@server/initializers/constants'
import { getLowercaseExtension, uuidRegex } from '@shared/core-utils'
import { Netrc } from 'netrc-parser'
import { join } from 'path'
import { createLogger, format, transports } from 'winston'
-import { PeerTubeServer } from '@shared/extra-utils'
+import { PeerTubeServer } from '@shared/server-commands'
import { UserRole } from '@shared/models'
import { VideoPrivacy } from '../../shared/models/videos'
import { getAppNumber, isTestInstance } from '../helpers/core-utils'
getLogger,
getServerCredentials
} from './cli'
-import { wait } from '@shared/extra-utils'
+import { wait } from '@shared/server-commands'
import { YoutubeDLCLI, YoutubeDLInfo, YoutubeDLInfoBuilder } from '@server/helpers/youtube-dl'
import prompt = require('prompt')
-export * from './bulk'
-export * from './cli'
-export * from './custom-pages'
-export * from './feeds'
-export * from './logs'
-export * from './miscs'
-export * from './mock-servers'
-export * from './moderation'
-export * from './overviews'
-export * from './requests'
-export * from './search'
-export * from './server'
-export * from './socket'
-export * from './users'
-export * from './videos'
+export * from './ffprobe'
--- /dev/null
+export * from './bulk'
+export * from './cli'
+export * from './custom-pages'
+export * from './feeds'
+export * from './logs'
+export * from './miscs'
+export * from './mock-servers'
+export * from './moderation'
+export * from './overviews'
+export * from './requests'
+export * from './search'
+export * from './server'
+export * from './socket'
+export * from './users'
+export * from './videos'
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
import { expect } from 'chai'
-import { PeerTubeServer } from '../server/server'
+import { PeerTubeServer } from './server'
async function testHelloWorldRegisteredSettings (server: PeerTubeServer) {
const body = await server.plugins.getRegisteredSettings({ npmName: 'peertube-plugin-hello-world' })
"stripInternal": true,
"removeComments": false,
"emitDeclarationOnly": true
- }
+ },
+ "exclude": [
+ "server-commands/"
+ ]
}
--- /dev/null
+export * from './types'
--- /dev/null
+/* eslint-disable @typescript-eslint/array-type */
+
+export type FunctionPropertyNames<T> = {
+ [K in keyof T]: T[K] extends Function ? K : never
+}[keyof T]
+
+export type FunctionProperties<T> = Pick<T, FunctionPropertyNames<T>>
+
+export type AttributesOnly<T> = {
+ [K in keyof T]: T[K] extends Function ? never : T[K]
+}
+
+export type PickWith<T, KT extends keyof T, V> = {
+ [P in KT]: T[P] extends V ? V : never
+}
+
+export type PickWithOpt<T, KT extends keyof T, V> = {
+ [P in KT]?: T[P] extends V ? V : never
+}
+
+// https://github.com/krzkaczor/ts-essentials Rocks!
+export type DeepPartial<T> = {
+ [P in keyof T]?: T[P] extends Array<infer U>
+ ? Array<DeepPartial<U>>
+ : T[P] extends ReadonlyArray<infer U>
+ ? ReadonlyArray<DeepPartial<U>>
+ : DeepPartial<T[P]>
+}
+
+type Primitive = string | Function | number | boolean | Symbol | undefined | null
+export type DeepOmitHelper<T, K extends keyof T> = {
+ [P in K]: // extra level of indirection needed to trigger homomorhic behavior
+ T[P] extends infer TP // distribute over unions
+ ? TP extends Primitive
+ ? TP // leave primitives and functions alone
+ : TP extends any[]
+ ? DeepOmitArray<TP, K> // Array special handling
+ : DeepOmit<TP, K>
+ : never
+}
+export type DeepOmit<T, K> = T extends Primitive ? T : DeepOmitHelper<T, Exclude<keyof T, K>>
+
+export type DeepOmitArray<T extends any[], K> = {
+ [P in keyof T]: DeepOmit<T[P], K>
+}
projects / github / Chocobozzz / PeerTube.git / commitdiff
