X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=2cbf0f8fe5eabf19df83ef29a3206063db99a57a;hb=7b54a81cccf6b4c12269e9d6897d608b1a99537a;hp=7ba7d865a794b496682365ea0570a184a8ff67c3;hpb=db4b15f21fbf4e33434e930ffc7fb768cdcf9d42;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
index 7ba7d865a..2cbf0f8fe 100644
--- a/server/helpers/core-utils.ts
+++ b/server/helpers/core-utils.ts
@@ -8,8 +8,8 @@
 import { exec, ExecOptions } from 'child_process'
 import { BinaryToTextEncoding, createHash, randomBytes } from 'crypto'
 import { truncate } from 'lodash'
-import { basename, isAbsolute, join, resolve } from 'path'
-import * as pem from 'pem'
+import { basename, extname, isAbsolute, join, resolve } from 'path'
+import { createPrivateKey as createPrivateKey_1, getPublicKey as getPublicKey_1 } from 'pem'
 import { pipeline } from 'stream'
 import { URL } from 'url'
 import { promisify } from 'util'
@@ -32,6 +32,18 @@ const objectConverter = (oldObject: any, keyConverter: (e: string) => string, va
   return newObject
 }
 
+function mapToJSON (map: Map<any, any>) {
+  const obj: any = {}
+
+  for (const [ k, v ] of map) {
+    obj[k] = v
+  }
+
+  return obj
+}
+
+// ---------------------------------------------------------------------------
+
 const timeTable = {
   ms: 1,
   second: 1000,
@@ -110,6 +122,8 @@ export function parseBytes (value: string | number): number {
   }
 }
 
+// ---------------------------------------------------------------------------
+
 function sanitizeUrl (url: string) {
   const urlObject = new URL(url)
 
@@ -129,6 +143,8 @@ function sanitizeHost (host: string, remoteScheme: string) {
   return host.replace(new RegExp(`:${toRemove}$`), '')
 }
 
+// ---------------------------------------------------------------------------
+
 function isTestInstance () {
   return process.env.NODE_ENV === 'test'
 }
@@ -141,58 +157,35 @@ function getAppNumber () {
   return process.env.NODE_APP_INSTANCE
 }
 
+// ---------------------------------------------------------------------------
+
 let rootPath: string
 
 function root () {
   if (rootPath) return rootPath
 
-  // We are in /helpers/utils.js
-  rootPath = join(__dirname, '..', '..')
+  rootPath = __dirname
 
+  if (basename(rootPath) === 'helpers') rootPath = resolve(rootPath, '..')
+  if (basename(rootPath) === 'server') rootPath = resolve(rootPath, '..')
   if (basename(rootPath) === 'dist') rootPath = resolve(rootPath, '..')
 
   return rootPath
 }
 
-// Thanks: https://stackoverflow.com/a/12034334
-function escapeHTML (stringParam) {
-  if (!stringParam) return ''
-
-  const entityMap = {
-    '&': '&amp;',
-    '<': '&lt;',
-    '>': '&gt;',
-    '"': '&quot;',
-    '\'': '&#39;',
-    '/': '&#x2F;',
-    '`': '&#x60;',
-    '=': '&#x3D;'
-  }
-
-  return String(stringParam).replace(/[&<>"'`=/]/g, s => entityMap[s])
-}
-
-function pageToStartAndCount (page: number, itemsPerPage: number) {
-  const start = (page - 1) * itemsPerPage
+function buildPath (path: string) {
+  if (isAbsolute(path)) return path
 
-  return { start, count: itemsPerPage }
+  return join(root(), path)
 }
 
-function mapToJSON (map: Map<any, any>) {
-  const obj: any = {}
-
-  for (const [ k, v ] of map) {
-    obj[k] = v
-  }
+function getLowercaseExtension (filename: string) {
+  const ext = extname(filename) || ''
 
-  return obj
+  return ext.toLowerCase()
 }
 
-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, options: { length: number, separator?: RegExp, omission?: string }) {
@@ -207,6 +200,27 @@ function peertubeTruncate (str: string, options: { length: number, separator?: R
   return truncate(str, options)
 }
 
+function pageToStartAndCount (page: number, itemsPerPage: number) {
+  const start = (page - 1) * itemsPerPage
+
+  return { start, count: itemsPerPage }
+}
+
+// ---------------------------------------------------------------------------
+
+type SemVersion = { major: number, minor: number, patch: number }
+function parseSemVersion (s: string) {
+  const parsed = s.match(/^v?(\d+)\.(\d+)\.(\d+)$/i)
+
+  return {
+    major: parseInt(parsed[1]),
+    minor: parseInt(parsed[2]),
+    patch: parseInt(parsed[3])
+  } as SemVersion
+}
+
+// ---------------------------------------------------------------------------
+
 function sha256 (str: string | Buffer, encoding: BinaryToTextEncoding = 'hex') {
   return createHash('sha256').update(str).digest(encoding)
 }
@@ -215,6 +229,8 @@ 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) => {
@@ -226,6 +242,20 @@ 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<A> (func: (cb: (err: any, result: A) => void) => void): () => Promise<A> {
   return function promisified (): Promise<A> {
     return new Promise<A>((resolve: (arg: A) => void, reject: (err: any) => void) => {
@@ -252,8 +282,8 @@ function promisify2<T, U, A> (func: (arg1: T, arg2: U, cb: (err: any, result: A)
 }
 
 const randomBytesPromise = promisify1<number, Buffer>(randomBytes)
-const createPrivateKey = promisify1<number, { key: string }>(pem.createPrivateKey)
-const getPublicKey = promisify1<string, { publicKey: string }>(pem.getPublicKey)
+const createPrivateKey = promisify1<number, { key: string }>(createPrivateKey_1)
+const getPublicKey = promisify1<string, { publicKey: string }>(getPublicKey_1)
 const execPromise2 = promisify2<string, any, string>(exec)
 const execPromise = promisify1<string, string>(exec)
 const pipelinePromise = promisify(pipeline)
@@ -266,18 +296,21 @@ export {
   getAppNumber,
 
   objectConverter,
+  mapToJSON,
+
   root,
-  escapeHTML,
-  pageToStartAndCount,
+  buildPath,
+  getLowercaseExtension,
   sanitizeUrl,
   sanitizeHost,
-  buildPath,
+
   execShell,
+
+  pageToStartAndCount,
   peertubeTruncate,
 
   sha256,
   sha1,
-  mapToJSON,
 
   promisify0,
   promisify1,
@@ -288,5 +321,10 @@ export {
   getPublicKey,
   execPromise2,
   execPromise,
-  pipelinePromise
+  pipelinePromise,
+
+  parseSemVersion,
+
+  isOdd,
+  toEven
 }