X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=7e8252aa40f3db496d367303335ad9ab39b94f63;hb=b8f4167fb6fa448125aeecff80b201d74e27fe6a;hp=2951aef1eebc86abc90e032d63c3f63f6d51501b;hpb=c1e791bad0b079af67398f6407221e6dcbb573dd;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
index 2951aef1e..7e8252aa4 100644
--- a/server/helpers/core-utils.ts
+++ b/server/helpers/core-utils.ts
@@ -3,16 +3,107 @@
Useful to avoid circular dependencies.
*/
-import * as bcrypt from 'bcrypt'
-import * as createTorrent from 'create-torrent'
-import { pseudoRandomBytes } from 'crypto'
-import { copyFile, readdir, readFile, rename, stat, Stats, unlink, writeFile } from 'fs'
-import * as mkdirp from 'mkdirp'
-import { isAbsolute, join } from 'path'
+import { createHash, HexBase64Latin1Encoding, pseudoRandomBytes } from 'crypto'
+import { basename, isAbsolute, join, resolve } from 'path'
import * as pem from 'pem'
-import * as rimraf from 'rimraf'
import { URL } from 'url'
import { truncate } from 'lodash'
+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 (Array.isArray(oldObject)) {
+ return oldObject.map(e => objectConverter(e, keyConverter, valueConverter))
+ }
+
+ const newObject = {}
+ Object.keys(oldObject).forEach(oldKey => {
+ const newKey = keyConverter(oldKey)
+ newObject[ newKey ] = objectConverter(oldObject[ oldKey ], keyConverter, valueConverter)
+ })
+
+ return newObject
+}
+
+const timeTable = {
+ ms: 1,
+ second: 1000,
+ minute: 60000,
+ hour: 3600000,
+ day: 3600000 * 24,
+ week: 3600000 * 24 * 7,
+ month: 3600000 * 24 * 30
+}
+
+export function parseDurationToMs (duration: number | string): number {
+ if (typeof duration === 'number') return duration
+
+ if (typeof duration === 'string') {
+ const split = duration.match(/^([\d\.,]+)\s?(\w+)$/)
+
+ if (split.length === 3) {
+ const len = parseFloat(split[1])
+ let unit = split[2].replace(/s$/i,'').toLowerCase()
+ if (unit === 'm') {
+ unit = 'ms'
+ }
+
+ return (len || 1) * (timeTable[unit] || 0)
+ }
+ }
+
+ throw new Error(`Duration ${duration} could not be properly parsed`)
+}
+
+export function parseBytes (value: string | number): number {
+ if (typeof value === 'number') return value
+
+ const tgm = /^(\d+)\s*TB\s*(\d+)\s*GB\s*(\d+)\s*MB$/
+ const tg = /^(\d+)\s*TB\s*(\d+)\s*GB$/
+ const tm = /^(\d+)\s*TB\s*(\d+)\s*MB$/
+ const gm = /^(\d+)\s*GB\s*(\d+)\s*MB$/
+ const t = /^(\d+)\s*TB$/
+ const g = /^(\d+)\s*GB$/
+ const m = /^(\d+)\s*MB$/
+ const b = /^(\d+)\s*B$/
+ let match
+
+ if (value.match(tgm)) {
+ match = value.match(tgm)
+ return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024
+ + parseInt(match[2], 10) * 1024 * 1024 * 1024
+ + parseInt(match[3], 10) * 1024 * 1024
+ } else if (value.match(tg)) {
+ match = value.match(tg)
+ return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024
+ + parseInt(match[2], 10) * 1024 * 1024 * 1024
+ } else if (value.match(tm)) {
+ match = value.match(tm)
+ return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024
+ + parseInt(match[2], 10) * 1024 * 1024
+ } else if (value.match(gm)) {
+ match = value.match(gm)
+ return parseInt(match[1], 10) * 1024 * 1024 * 1024
+ + parseInt(match[2], 10) * 1024 * 1024
+ } else if (value.match(t)) {
+ match = value.match(t)
+ return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024
+ } else if (value.match(g)) {
+ match = value.match(g)
+ return parseInt(match[1], 10) * 1024 * 1024 * 1024
+ } else if (value.match(m)) {
+ match = value.match(m)
+ return parseInt(match[1], 10) * 1024 * 1024
+ } else if (value.match(b)) {
+ match = value.match(b)
+ return parseInt(match[1], 10) * 1024
+ } else {
+ return parseInt(value, 10)
+ }
+}
function sanitizeUrl (url: string) {
const urlObject = new URL(url)
@@ -37,16 +128,24 @@ function isTestInstance () {
return process.env.NODE_ENV === 'test'
}
+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
@@ -58,7 +157,7 @@ function escapeHTML (stringParam) {
'<': '<',
'>': '>',
'"': '"',
- "'": ''',
+ '\'': ''',
'/': '/',
'`': '`',
'=': '='
@@ -80,21 +179,36 @@ 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)
}
+function sha256 (str: string | Buffer, encoding: HexBase64Latin1Encoding = 'hex') {
+ return createHash('sha256').update(str).digest(encoding)
+}
+
+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) => {
@@ -136,53 +250,39 @@ function promisify2WithVoid (func: (arg1: T, arg2: U, cb: (err: any) => vo
}
}
-const copyFilePromise = promisify2WithVoid(copyFile)
-const readFileBufferPromise = promisify1(readFile)
-const unlinkPromise = promisify1WithVoid(unlink)
-const renamePromise = promisify2WithVoid(rename)
-const writeFilePromise = promisify2WithVoid(writeFile)
-const readdirPromise = promisify1(readdir)
-const mkdirpPromise = promisify1(mkdirp)
-// we cannot modify the Promise types, so we should make the promisify instance check mkdirp
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 rimrafPromise = promisify1WithVoid(rimraf)
-const statPromise = promisify1(stat)
+const execPromise2 = promisify2(exec)
+const execPromise = promisify1(exec)
// ---------------------------------------------------------------------------
export {
isTestInstance,
+ isProdInstance,
+ getAppNumber,
+
+ objectConverter,
root,
escapeHTML,
pageToStartAndCount,
sanitizeUrl,
sanitizeHost,
buildPath,
+ execShell,
peertubeTruncate,
+ sha256,
+ sha1,
+
promisify0,
promisify1,
+ promisify2,
- copyFilePromise,
- readdirPromise,
- readFileBufferPromise,
- unlinkPromise,
- renamePromise,
- writeFilePromise,
- mkdirpPromise,
pseudoRandomBytesPromise,
createPrivateKey,
getPublicKey,
- bcryptComparePromise,
- bcryptGenSaltPromise,
- bcryptHashPromise,
- createTorrentPromise,
- rimrafPromise,
- statPromise
+ execPromise2,
+ execPromise
}