X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=7e8252aa40f3db496d367303335ad9ab39b94f63;hb=b8f4167fb6fa448125aeecff80b201d74e27fe6a;hp=f38b82d9744fa99110aaac6863ce6240be63f514;hpb=88108880bbdba473cfe36ecbebc1c3c4f972e102;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
index f38b82d97..7e8252aa4 100644
--- a/server/helpers/core-utils.ts
+++ b/server/helpers/core-utils.ts
@@ -3,22 +3,19 @@
Useful to avoid circular dependencies.
*/
-import * as bcrypt from 'bcrypt'
-import * as createTorrent from 'create-torrent'
import { createHash, HexBase64Latin1Encoding, pseudoRandomBytes } from 'crypto'
-import { isAbsolute, join } from 'path'
+import { basename, isAbsolute, join, resolve } from 'path'
import * as pem from 'pem'
import { URL } from 'url'
import { truncate } from 'lodash'
-import { exec } from 'child_process'
-import { isArray } from './custom-validators/misc'
+import { exec, ExecOptions } from 'child_process'
const objectConverter = (oldObject: any, keyConverter: (e: string) => string, valueConverter: (e: any) => any) => {
if (!oldObject || typeof oldObject !== 'object') {
return valueConverter(oldObject)
}
- if (isArray(oldObject)) {
+ if (Array.isArray(oldObject)) {
return oldObject.map(e => objectConverter(e, keyConverter, valueConverter))
}
@@ -41,7 +38,7 @@ const timeTable = {
month: 3600000 * 24 * 30
}
-export function parseDuration (duration: number | string): number {
+export function parseDurationToMs (duration: number | string): number {
if (typeof duration === 'number') return duration
if (typeof duration === 'string') {
@@ -58,7 +55,7 @@ export function parseDuration (duration: number | string): number {
}
}
- throw new Error('Duration could not be properly parsed')
+ throw new Error(`Duration ${duration} could not be properly parsed`)
}
export function parseBytes (value: string | number): number {
@@ -135,16 +132,20 @@ function isProdInstance () {
return process.env.NODE_ENV === 'production'
}
+function getAppNumber () {
+ return process.env.NODE_APP_INSTANCE
+}
+
+let rootPath: string
function root () {
+ if (rootPath) return rootPath
+
// We are in /helpers/utils.js
- const paths = [ __dirname, '..', '..' ]
+ rootPath = join(__dirname, '..', '..')
- // We are under /dist directory
- if (process.mainModule && process.mainModule.filename.endsWith('.ts') === false) {
- paths.push('..')
- }
+ if (basename(rootPath) === 'dist') rootPath = resolve(rootPath, '..')
- return join.apply(null, paths)
+ return rootPath
}
// Thanks: https://stackoverflow.com/a/12034334
@@ -178,18 +179,15 @@ function buildPath (path: string) {
}
// Consistent with .length, lodash truncate function is not
-function peertubeTruncate (str: string, maxLength: number) {
- const options = {
- length: maxLength
- }
+function peertubeTruncate (str: string, options: { length: number, separator?: RegExp, omission?: string }) {
const truncatedStr = truncate(str, options)
// The truncated string is okay, we can return it
- if (truncatedStr.length <= maxLength) return truncatedStr
+ if (truncatedStr.length <= options.length) return truncatedStr
// Lodash takes into account all UTF characters, whereas String.prototype.length does not: some characters have a length of 2
// We always use the .length so we need to truncate more if needed
- options.length -= truncatedStr.length - maxLength
+ options.length -= truncatedStr.length - options.length
return truncate(str, options)
}
@@ -201,6 +199,16 @@ function sha1 (str: string | Buffer, encoding: HexBase64Latin1Encoding = 'hex')
return createHash('sha1').update(str).digest(encoding)
}
+function execShell (command: string, options?: ExecOptions) {
+ return new Promise<{ err?: Error, stdout: string, stderr: string }>((res, rej) => {
+ exec(command, options, (err, stdout, stderr) => {
+ if (err) return rej({ err, stdout, stderr })
+
+ return res({ stdout, stderr })
+ })
+ })
+}
+
function promisify0 (func: (cb: (err: any, result: A) => void) => void): () => Promise {
return function promisified (): Promise {
return new Promise((resolve: (arg: A) => void, reject: (err: any) => void) => {
@@ -245,10 +253,6 @@ function promisify2WithVoid (func: (arg1: T, arg2: U, cb: (err: any) => vo
const pseudoRandomBytesPromise = promisify1(pseudoRandomBytes)
const createPrivateKey = promisify1(pem.createPrivateKey)
const getPublicKey = promisify1(pem.getPublicKey)
-const bcryptComparePromise = promisify2(bcrypt.compare)
-const bcryptGenSaltPromise = promisify1(bcrypt.genSalt)
-const bcryptHashPromise = promisify2(bcrypt.hash)
-const createTorrentPromise = promisify2(createTorrent)
const execPromise2 = promisify2(exec)
const execPromise = promisify1(exec)
@@ -257,6 +261,7 @@ const execPromise = promisify1(exec)
export {
isTestInstance,
isProdInstance,
+ getAppNumber,
objectConverter,
root,
@@ -265,6 +270,7 @@ export {
sanitizeUrl,
sanitizeHost,
buildPath,
+ execShell,
peertubeTruncate,
sha256,
@@ -272,14 +278,11 @@ export {
promisify0,
promisify1,
+ promisify2,
pseudoRandomBytesPromise,
createPrivateKey,
getPublicKey,
- bcryptComparePromise,
- bcryptGenSaltPromise,
- bcryptHashPromise,
- createTorrentPromise,
execPromise2,
execPromise
}