X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fhelpers%2Futils.ts;h=3b618360bc25c52b37a86734c7a00d430e9cf958;hb=73c695919c6569bfb667c36fc5a6b9b862130a0d;hp=3317dddc33de5cfea04bcbc2081004b33e9f55bc;hpb=14d3270f363245d2c83fcc2ac109e39743b5627e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts index 3317dddc3..3b618360b 100644 --- a/server/helpers/utils.ts +++ b/server/helpers/utils.ts @@ -1,17 +1,72 @@ import * as express from 'express' -import * as Promise from 'bluebird' - -import { pseudoRandomBytesPromise } from './core-utils' -import { CONFIG, database as db } from '../initializers' +import * as multer from 'multer' +import { Model } from 'sequelize-typescript' import { ResultList } from '../../shared' -import { VideoResolution } from '../../shared/models/videos/video-resolution.enum' +import { VideoResolution } from '../../shared/models/videos' +import { CONFIG, REMOTE_SCHEME } from '../initializers' +import { UserModel } from '../models/account/user' +import { ActorModel } from '../models/activitypub/actor' +import { ApplicationModel } from '../models/application/application' +import { pseudoRandomBytesPromise } from './core-utils' +import { logger } from './logger' + +function getHostWithPort (host: string) { + const splitted = host.split(':') + + // The port was not specified + if (splitted.length === 1) { + if (REMOTE_SCHEME.HTTP === 'https') return host + ':443' + + return host + ':80' + } + + return host +} function badRequest (req: express.Request, res: express.Response, next: express.NextFunction) { - res.type('json').status(400).end() + return res.type('json').status(400).end() +} + +function createReqFiles ( + fieldNames: string[], + mimeTypes: { [ id: string ]: string }, + destinations: { [ fieldName: string ]: string } +) { + const storage = multer.diskStorage({ + destination: (req, file, cb) => { + cb(null, destinations[file.fieldname]) + }, + + filename: async (req, file, cb) => { + const extension = mimeTypes[file.mimetype] + let randomString = '' + + try { + randomString = await generateRandomString(16) + } catch (err) { + logger.error('Cannot generate random string for file name.', err) + randomString = 'fake-random-string' + } + + cb(null, randomString + extension) + } + }) + + const fields = [] + for (const fieldName of fieldNames) { + fields.push({ + name: fieldName, + maxCount: 1 + }) + } + + return multer({ storage }).fields(fields) } -function generateRandomString (size: number) { - return pseudoRandomBytesPromise(size).then(raw => raw.toString('hex')) +async function generateRandomString (size: number) { + const raw = await pseudoRandomBytesPromise(size) + + return raw.toString('hex') } interface FormattableToJSON { @@ -33,19 +88,19 @@ function getFormattedObjects (objects: T[], obje return res } -function isSignupAllowed () { +async function isSignupAllowed () { if (CONFIG.SIGNUP.ENABLED === false) { - return Promise.resolve(false) + return false } // No limit and signup is enabled if (CONFIG.SIGNUP.LIMIT === -1) { - return Promise.resolve(true) + return true } - return db.User.countTotal().then(totalUsers => { - return totalUsers < CONFIG.SIGNUP.LIMIT - }) + const totalUsers = await UserModel.countTotal() + + return totalUsers < CONFIG.SIGNUP.LIMIT } function computeResolutionsToTranscode (videoFileHeight: number) { @@ -61,7 +116,7 @@ function computeResolutionsToTranscode (videoFileHeight: number) { ] for (const resolution of resolutions) { - if (configResolutions[resolution.toString()] === true && videoFileHeight > resolution) { + if (configResolutions[resolution + 'p'] === true && videoFileHeight > resolution) { resolutionsEnabled.push(resolution) } } @@ -69,6 +124,28 @@ function computeResolutionsToTranscode (videoFileHeight: number) { return resolutionsEnabled } +function resetSequelizeInstance (instance: Model, savedFields: object) { + Object.keys(savedFields).forEach(key => { + const value = savedFields[key] + instance.set(key, value) + }) +} + +let serverActor: ActorModel +async function getServerActor () { + if (serverActor === undefined) { + const application = await ApplicationModel.load() + serverActor = application.Account.Actor + } + + if (!serverActor) { + logger.error('Cannot load server actor.') + process.exit(0) + } + + return Promise.resolve(serverActor) +} + type SortType = { sortModel: any, sortValue: string } // --------------------------------------------------------------------------- @@ -79,5 +156,9 @@ export { getFormattedObjects, isSignupAllowed, computeResolutionsToTranscode, - SortType + resetSequelizeInstance, + getServerActor, + SortType, + getHostWithPort, + createReqFiles }