X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=4bbf0228d6369e558453f6b69d8f2511fb88f416;hb=9452d4fd3321148fb80b64a67bd9983fee6c208e;hp=b5bf2c92c75ceab3da1ca7523fcf973147c95d48;hpb=ea54cd04c1ff0e55651cd5fb1a83672acde68604;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
index b5bf2c92c..4bbf0228d 100644
--- a/server/helpers/core-utils.ts
+++ b/server/helpers/core-utils.ts
@@ -6,10 +6,9 @@
*/
import { exec, ExecOptions } from 'child_process'
-import { BinaryToTextEncoding, createHash, randomBytes } from 'crypto'
+import { randomBytes } from 'crypto'
import { truncate } from 'lodash'
-import { basename, extname, isAbsolute, join, resolve } from 'path'
-import * as pem from 'pem'
+import { createPrivateKey as createPrivateKey_1, getPublicKey as getPublicKey_1 } from 'pem'
import { pipeline } from 'stream'
import { URL } from 'url'
import { promisify } from 'util'
@@ -57,6 +56,7 @@ const timeTable = {
export function parseDurationToMs (duration: number | string): number {
if (duration === null) return null
if (typeof duration === 'number') return duration
+ if (!isNaN(+duration)) return +duration
if (typeof duration === 'string') {
const split = duration.match(/^([\d.,]+)\s?(\w+)$/)
@@ -77,6 +77,7 @@ export function parseDurationToMs (duration: number | string): number {
export function parseBytes (value: string | number): number {
if (typeof value === 'number') return value
+ if (!isNaN(+value)) return +value
const tgm = /^(\d+)\s*TB\s*(\d+)\s*GB\s*(\d+)\s*MB$/
const tg = /^(\d+)\s*TB\s*(\d+)\s*GB$/
@@ -86,40 +87,55 @@ export function parseBytes (value: string | number): number {
const g = /^(\d+)\s*GB$/
const m = /^(\d+)\s*MB$/
const b = /^(\d+)\s*B$/
- let match
+
+ let match: RegExpMatchArray
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)) {
+ }
+
+ 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)) {
+ }
+
+ 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)) {
+ }
+
+ 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)) {
+ }
+
+ if (value.match(t)) {
match = value.match(t)
return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024
- } else if (value.match(g)) {
+ }
+
+ if (value.match(g)) {
match = value.match(g)
return parseInt(match[1], 10) * 1024 * 1024 * 1024
- } else if (value.match(m)) {
+ }
+
+ if (value.match(m)) {
match = value.match(m)
return parseInt(match[1], 10) * 1024 * 1024
- } else if (value.match(b)) {
+ }
+
+ if (value.match(b)) {
match = value.match(b)
return parseInt(match[1], 10) * 1024
- } else {
- return parseInt(value, 10)
}
+
+ return parseInt(value, 10)
}
// ---------------------------------------------------------------------------
@@ -149,39 +165,20 @@ function isTestInstance () {
return process.env.NODE_ENV === 'test'
}
-function isProdInstance () {
- return process.env.NODE_ENV === 'production'
+function isDevInstance () {
+ return process.env.NODE_ENV === 'dev'
}
-function getAppNumber () {
- return process.env.NODE_APP_INSTANCE
+function isTestOrDevInstance () {
+ return isTestInstance() || isDevInstance()
}
-// ---------------------------------------------------------------------------
-
-let rootPath: string
-
-function root () {
- if (rootPath) return rootPath
-
- // We are in /helpers/utils.js
- rootPath = join(__dirname, '..', '..')
-
- if (basename(rootPath) === 'dist') rootPath = resolve(rootPath, '..')
-
- return rootPath
-}
-
-function buildPath (path: string) {
- if (isAbsolute(path)) return path
-
- return join(root(), path)
+function isProdInstance () {
+ return process.env.NODE_ENV === 'production'
}
-function getLowercaseExtension (filename: string) {
- const ext = extname(filename) || ''
-
- return ext.toLowerCase()
+function getAppNumber () {
+ return process.env.NODE_APP_INSTANCE || ''
}
// ---------------------------------------------------------------------------
@@ -220,16 +217,6 @@ function parseSemVersion (s: string) {
// ---------------------------------------------------------------------------
-function sha256 (str: string | Buffer, encoding: BinaryToTextEncoding = 'hex') {
- return createHash('sha256').update(str).digest(encoding)
-}
-
-function sha1 (str: string | Buffer, encoding: BinaryToTextEncoding = '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) => {
@@ -243,6 +230,18 @@ function execShell (command: string, options?: ExecOptions) {
// ---------------------------------------------------------------------------
+function isOdd (num: number) {
+ return (num % 2) !== 0
+}
+
+function toEven (num: number) {
+ if (isOdd(num)) return num + 1
+
+ return num
+}
+
+// ---------------------------------------------------------------------------
+
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) => {
@@ -269,8 +268,8 @@ function promisify2 (func: (arg1: T, arg2: U, cb: (err: any, result: A)
}
const randomBytesPromise = promisify1(randomBytes)
-const createPrivateKey = promisify1(pem.createPrivateKey)
-const getPublicKey = promisify1(pem.getPublicKey)
+const createPrivateKey = promisify1(createPrivateKey_1)
+const getPublicKey = promisify1(getPublicKey_1)
const execPromise2 = promisify2(exec)
const execPromise = promisify1(exec)
const pipelinePromise = promisify(pipeline)
@@ -279,15 +278,13 @@ const pipelinePromise = promisify(pipeline)
export {
isTestInstance,
+ isTestOrDevInstance,
isProdInstance,
getAppNumber,
objectConverter,
mapToJSON,
- root,
- buildPath,
- getLowercaseExtension,
sanitizeUrl,
sanitizeHost,
@@ -296,9 +293,6 @@ export {
pageToStartAndCount,
peertubeTruncate,
- sha256,
- sha1,
-
promisify0,
promisify1,
promisify2,
@@ -310,5 +304,8 @@ export {
execPromise,
pipelinePromise,
- parseSemVersion
+ parseSemVersion,
+
+ isOdd,
+ toEven
}