X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=0bd84ffaa88f2f6c59578210e7b654186673a673;hb=903353d67a8d0fdda8465ed6c57b77a9a5afbe92;hp=935fd22d9b4199d816176dca0481b61d12678466;hpb=ba5a8d89bbf049e4afc41543bcc072cccdb02669;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts index 935fd22d9..0bd84ffaa 100644 --- a/server/helpers/core-utils.ts +++ b/server/helpers/core-utils.ts @@ -10,7 +10,9 @@ import { BinaryToTextEncoding, createHash, randomBytes } from 'crypto' import { truncate } from 'lodash' import { basename, isAbsolute, join, resolve } from 'path' import * as pem from 'pem' +import { pipeline } from 'stream' import { URL } from 'url' +import { promisify } from 'util' const objectConverter = (oldObject: any, keyConverter: (e: string) => string, valueConverter: (e: any) => any) => { if (!oldObject || typeof oldObject !== 'object') { @@ -249,11 +251,23 @@ function promisify2 (func: (arg1: T, arg2: U, cb: (err: any, result: A) } } +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 +} + const randomBytesPromise = promisify1(randomBytes) const createPrivateKey = promisify1(pem.createPrivateKey) const getPublicKey = promisify1(pem.getPublicKey) const execPromise2 = promisify2(exec) const execPromise = promisify1(exec) +const pipelinePromise = promisify(pipeline) // --------------------------------------------------------------------------- @@ -284,5 +298,8 @@ export { createPrivateKey, getPublicKey, execPromise2, - execPromise + execPromise, + pipelinePromise, + + parseSemVersion }