X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Futils.ts;h=a42474417769c4aeb97f9c8b5cf0b3e8757d7afc;hb=39ba2e8e3a71961cd0087c57d25905f6a97a6b69;hp=1dcbd31c4c8ad1a7f463502a30ed1ca883277aeb;hpb=69818c9394366b954b6ba3bd697bd9d2b09f2a16;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts
index 1dcbd31c4..a42474417 100644
--- a/server/helpers/utils.ts
+++ b/server/helpers/utils.ts
@@ -1,57 +1,66 @@
-import * as express from 'express'
-
-import { pseudoRandomBytes } from 'crypto'
-import { join } from 'path'
-
+import { ResultList } from '../../shared'
+import { CONFIG } from '../initializers'
+import { ApplicationModel } from '../models/application/application'
+import { pseudoRandomBytesPromise, sha256 } from './core-utils'
 import { logger } from './logger'
+import { join } from 'path'
+import { Instance as ParseTorrent } from 'parse-torrent'
+import { remove } from 'fs-extra'
+import * as memoizee from 'memoizee'
 
-function badRequest (req: express.Request, res: express.Response, next: express.NextFunction) {
-  res.type('json').status(400).end()
+function deleteFileAsync (path: string) {
+  remove(path)
+    .catch(err => logger.error('Cannot delete the file %s asynchronously.', path, { err }))
 }
 
-function generateRandomString (size: number, callback: (err: Error, randomString?: string) => void) {
-  pseudoRandomBytes(size, function (err, raw) {
-    if (err) return callback(err)
-
-    callback(null, raw.toString('hex'))
-  })
-}
+async function generateRandomString (size: number) {
+  const raw = await pseudoRandomBytesPromise(size)
 
-function createEmptyCallback () {
-  return function (err) {
-    if (err) logger.error('Error in empty callback.', { error: err })
-  }
+  return raw.toString('hex')
 }
 
-function isTestInstance () {
-  return process.env.NODE_ENV === 'test'
+interface FormattableToJSON {
+  toFormattedJSON (args?: any)
 }
 
-function getFormatedObjects (objects: any[], objectsTotal: number) {
-  const formatedObjects = []
+function getFormattedObjects<U, T extends FormattableToJSON> (objects: T[], objectsTotal: number, formattedArg?: any) {
+  const formattedObjects: U[] = []
 
-  objects.forEach(function (object) {
-    formatedObjects.push(object.toFormatedJSON())
+  objects.forEach(object => {
+    formattedObjects.push(object.toFormattedJSON(formattedArg))
   })
 
   return {
     total: objectsTotal,
-    data: formatedObjects
-  }
+    data: formattedObjects
+  } as ResultList<U>
+}
+
+const getServerActor = memoizee(async function () {
+  const application = await ApplicationModel.load()
+  if (!application) throw Error('Could not load Application from database.')
+
+  return application.Account.Actor
+})
+
+function generateVideoTmpPath (target: string | ParseTorrent) {
+  const id = typeof target === 'string' ? target : target.infoHash
+
+  const hash = sha256(id)
+  return join(CONFIG.STORAGE.VIDEOS_DIR, hash + '-import.mp4')
 }
 
-function root () {
-  // We are in /dist/helpers/utils.js
-  return join(__dirname, '..', '..', '..')
+function getSecureTorrentName (originalName: string) {
+  return sha256(originalName) + '.torrent'
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  badRequest,
-  createEmptyCallback,
+  deleteFileAsync,
   generateRandomString,
-  isTestInstance,
-  getFormatedObjects,
-  root
+  getFormattedObjects,
+  getSecureTorrentName,
+  getServerActor,
+  generateVideoTmpPath
 }