yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 18:29:27 +02:00
Code Issues Releases Wiki Activity

chore(refactor): remove shared folder dependencies to the server

Browse source 
Many files from the `shared` folder were importing files from the `server` folder.
When attempting to use Typescript project references to describe dependencies,
it highlighted a circular dependency beetween `shared` <-> `server`.

The Typescript project forbid such usages.
Using project references greatly improve performance by rebuilding only
the updated project and not all source files.
> see https://www.typescriptlang.org/docs/handbook/project-references.html
This commit is contained in:
lutangar 2021-11-02 19:11:20 +01:00 • committed by Chocobozzz
parent 854f533c12
commit 06aad80165
78 changed files with 583 additions and 485 deletions
Download patch file Download diff file Expand all files Collapse all files

47
server/helpers/core-utils.ts
View file

@ -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'
@ -159,34 +158,6 @@ function getAppNumber () {
// ---------------------------------------------------------------------------
let rootPath: string
function root () {
if (rootPath) return rootPath
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
}
function buildPath (path: string) {
if (isAbsolute(path)) return path
return join(root(), path)
}
function getLowercaseExtension (filename: string) {
const ext = extname(filename) || ''
return ext.toLowerCase()
}
// ---------------------------------------------------------------------------
// Consistent with .length, lodash truncate function is not
function peertubeTruncate (str: string, options: { length: number, separator?: RegExp, omission?: string }) {
const truncatedStr = truncate(str, options)
@ -221,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) => {
@ -298,9 +259,6 @@ export {
objectConverter,
mapToJSON,
root,
buildPath,
getLowercaseExtension,
sanitizeUrl,
sanitizeHost,
@ -309,9 +267,6 @@ export {
pageToStartAndCount,
peertubeTruncate,
sha256,
sha1,
promisify0,
promisify1,
promisify2,