X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=f5ef187fe73ccc29841e9b5786d8eb532de3d9ec;hb=7348b1fd84dee869b3c36554aea6797f09d4ceed;hp=4981bb4ecb4e64cee7566ed65673201a7f427ce2;hpb=604abfbef5e80d94e46658e4efa762adeab855ea;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
index 4981bb4ec..f5ef187fe 100644
--- a/server/helpers/core-utils.ts
+++ b/server/helpers/core-utils.ts
@@ -5,13 +5,41 @@
import * as bcrypt from 'bcrypt'
import * as createTorrent from 'create-torrent'
-import { pseudoRandomBytes } from 'crypto'
-import { readdir, readFile, rename, stat, Stats, unlink, writeFile } from 'fs'
-import * as mkdirp from 'mkdirp'
-import { join } from 'path'
+import { createHash, pseudoRandomBytes } from 'crypto'
+import { isAbsolute, join } from 'path'
import * as pem from 'pem'
import * as rimraf from 'rimraf'
import { URL } from 'url'
+import { truncate } from 'lodash'
+
+const timeTable = {
+ ms: 1,
+ second: 1000,
+ minute: 60000,
+ hour: 3600000,
+ day: 3600000 * 24,
+ week: 3600000 * 24 * 7,
+ month: 3600000 * 24 * 30
+}
+export function parseDuration (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 could not be properly parsed')
+}
function sanitizeUrl (url: string) {
const urlObject = new URL(url)
@@ -41,7 +69,7 @@ function root () {
const paths = [ __dirname, '..', '..' ]
// We are under /dist directory
- if (process.mainModule.filename.endsWith('.ts') === false) {
+ if (process.mainModule && process.mainModule.filename.endsWith('.ts') === false) {
paths.push('..')
}
@@ -50,12 +78,14 @@ function root () {
// Thanks: https://stackoverflow.com/a/12034334
function escapeHTML (stringParam) {
+ if (!stringParam) return ''
+
const entityMap = {
'&': '&',
'<': '<',
'>': '>',
'"': '"',
- "'": ''',
+ '\'': ''',
'/': '/',
'`': '`',
'=': '='
@@ -70,6 +100,32 @@ function pageToStartAndCount (page: number, itemsPerPage: number) {
return { start, count: itemsPerPage }
}
+function buildPath (path: string) {
+ if (isAbsolute(path)) return path
+
+ return join(root(), path)
+}
+
+// Consistent with .length, lodash truncate function is not
+function peertubeTruncate (str: string, maxLength: number) {
+ const options = {
+ length: maxLength
+ }
+ const truncatedStr = truncate(str, options)
+
+ // The truncated string is okay, we can return it
+ if (truncatedStr.length <= maxLength) 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
+ return truncate(str, options)
+}
+
+function sha256 (str: string) {
+ return createHash('sha256').update(str).digest('hex')
+}
+
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) => {
@@ -111,12 +167,6 @@ function promisify2WithVoid (func: (arg1: T, arg2: U, cb: (err: any) => vo
}
}
-const readFileBufferPromise = promisify1(readFile)
-const unlinkPromise = promisify1WithVoid(unlink)
-const renamePromise = promisify2WithVoid(rename)
-const writeFilePromise = promisify2WithVoid(writeFile)
-const readdirPromise = promisify1(readdir)
-const mkdirpPromise = promisify1(mkdirp)
const pseudoRandomBytesPromise = promisify1(pseudoRandomBytes)
const createPrivateKey = promisify1(pem.createPrivateKey)
const getPublicKey = promisify1(pem.getPublicKey)
@@ -124,8 +174,6 @@ 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)
// ---------------------------------------------------------------------------
@@ -136,23 +184,18 @@ export {
pageToStartAndCount,
sanitizeUrl,
sanitizeHost,
+ buildPath,
+ peertubeTruncate,
+ sha256,
promisify0,
promisify1,
- readdirPromise,
- readFileBufferPromise,
- unlinkPromise,
- renamePromise,
- writeFilePromise,
- mkdirpPromise,
pseudoRandomBytesPromise,
createPrivateKey,
getPublicKey,
bcryptComparePromise,
bcryptGenSaltPromise,
bcryptHashPromise,
- createTorrentPromise,
- rimrafPromise,
- statPromise
+ createTorrentPromise
}