X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=0ec45eb2e276833d115f5bfabfc35f6712511835;hb=3cb60ca19eba97738342a10e15d5e5a916e2e690;hp=7f28cfc8b1306151b7f551459428d64b34637a0d;hpb=41fb13c330de629df2d23379209e79c7af0f2e9a;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts index 7f28cfc8b..0ec45eb2e 100644 --- a/server/helpers/core-utils.ts +++ b/server/helpers/core-utils.ts @@ -6,9 +6,8 @@ */ 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 { createPrivateKey as createPrivateKey_1, getPublicKey as getPublicKey_1 } from 'pem' import { pipeline } from 'stream' import { URL } from 'url' @@ -154,34 +153,7 @@ function isProdInstance () { } 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, '..', '..') - - if (basename(rootPath) === 'dist') rootPath = resolve(rootPath, '..') - - return rootPath -} - -function buildPath (path: string) { - if (isAbsolute(path)) return path - - return join(root(), path) -} - -function getLowercaseExtension (filename: string) { - const ext = extname(filename) || '' - - return ext.toLowerCase() + return process.env.NODE_APP_INSTANCE || '' } // --------------------------------------------------------------------------- @@ -220,16 +192,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) => { @@ -297,9 +259,6 @@ export { objectConverter, mapToJSON, - root, - buildPath, - getLowercaseExtension, sanitizeUrl, sanitizeHost, @@ -308,9 +267,6 @@ export { pageToStartAndCount, peertubeTruncate, - sha256, - sha1, - promisify0, promisify1, promisify2,