X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=f5ef187fe73ccc29841e9b5786d8eb532de3d9ec;hb=41a676db3989fe3eca91301ac5f5aea30d98654a;hp=3dae781447d300a2d665f252ae467d3e399aa629;hpb=53abc4c272be9ecc951274458d054dbaf86e594d;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
index 3dae78144..f5ef187fe 100644
--- a/server/helpers/core-utils.ts
+++ b/server/helpers/core-utils.ts
@@ -3,24 +3,62 @@
Useful to avoid circular dependencies.
*/
-import { join } from 'path'
-import { pseudoRandomBytes } from 'crypto'
-import {
- readdir,
- readFile,
- rename,
- unlink,
- writeFile,
- access,
- stat,
- Stats
-} from 'fs'
-import * as mkdirp from 'mkdirp'
import * as bcrypt from 'bcrypt'
import * as createTorrent from 'create-torrent'
+import { createHash, pseudoRandomBytes } from 'crypto'
+import { isAbsolute, join } from 'path'
+import * as pem from 'pem'
import * as rimraf from 'rimraf'
-import * as openssl from 'openssl-wrapper'
-import * as Promise from 'bluebird'
+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)
+
+ if (urlObject.protocol === 'https:' && urlObject.port === '443') {
+ urlObject.port = ''
+ } else if (urlObject.protocol === 'http:' && urlObject.port === '80') {
+ urlObject.port = ''
+ }
+
+ return urlObject.href.replace(/\/$/, '')
+}
+
+// Don't import remote scheme from constants because we are in core utils
+function sanitizeHost (host: string, remoteScheme: string) {
+ const toRemove = remoteScheme === 'https' ? 443 : 80
+
+ return host.replace(new RegExp(`:${toRemove}$`), '')
+}
function isTestInstance () {
return process.env.NODE_ENV === 'test'
@@ -31,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('..')
}
@@ -40,12 +78,14 @@ function root () {
// Thanks: https://stackoverflow.com/a/12034334
function escapeHTML (stringParam) {
+ if (!stringParam) return ''
+
const entityMap = {
'&': '&',
'<': '<',
'>': '>',
'"': '"',
- "'": ''',
+ '\'': ''',
'/': '/',
'`': '`',
'=': '='
@@ -54,6 +94,38 @@ function escapeHTML (stringParam) {
return String(stringParam).replace(/[&<>"'`=\/]/g, s => entityMap[s])
}
+function pageToStartAndCount (page: number, itemsPerPage: number) {
+ const start = (page - 1) * itemsPerPage
+
+ 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) => {
@@ -95,22 +167,13 @@ function promisify2WithVoid (func: (arg1: T, arg2: U, cb: (err: any) => vo
}
}
-const readFilePromise = promisify2(readFile)
-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 accessPromise = promisify1WithVoid(access)
-const opensslExecPromise = promisify2WithVoid(openssl.exec)
+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)
// ---------------------------------------------------------------------------
@@ -118,23 +181,21 @@ export {
isTestInstance,
root,
escapeHTML,
+ pageToStartAndCount,
+ sanitizeUrl,
+ sanitizeHost,
+ buildPath,
+ peertubeTruncate,
+ sha256,
promisify0,
promisify1,
- readdirPromise,
- readFilePromise,
- readFileBufferPromise,
- unlinkPromise,
- renamePromise,
- writeFilePromise,
- mkdirpPromise,
+
pseudoRandomBytesPromise,
- accessPromise,
- opensslExecPromise,
+ createPrivateKey,
+ getPublicKey,
bcryptComparePromise,
bcryptGenSaltPromise,
bcryptHashPromise,
- createTorrentPromise,
- rimrafPromise,
- statPromise
+ createTorrentPromise
}