mirror of
https://github.com/Chocobozzz/PeerTube.git
synced 2024-05-17 04:12:40 +00:00
3a4992633e
Sorry for the very big commit that may lead to git log issues and merge
conflicts, but it's a major step forward:
* Server can be faster at startup because imports() are async and we can
easily lazy import big modules
* Angular doesn't seem to support ES import (with .js extension), so we
had to correctly organize peertube into a monorepo:
* Use yarn workspace feature
* Use typescript reference projects for dependencies
* Shared projects have been moved into "packages", each one is now a
node module (with a dedicated package.json/tsconfig.json)
* server/tools have been moved into apps/ and is now a dedicated app
bundled and published on NPM so users don't have to build peertube
cli tools manually
* server/tests have been moved into packages/ so we don't compile
them every time we want to run the server
* Use isolatedModule option:
* Had to move from const enum to const
(https://www.typescriptlang.org/docs/handbook/enums.html#objects-vs-enums)
* Had to explictely specify "type" imports when used in decorators
* Prefer tsx (that uses esbuild under the hood) instead of ts-node to
load typescript files (tests with mocha or scripts):
* To reduce test complexity as esbuild doesn't support decorator
metadata, we only test server files that do not import server
models
* We still build tests files into js files for a faster CI
* Remove unmaintained peertube CLI import script
* Removed some barrels to speed up execution (less imports)
67 lines
1.8 KiB
TypeScript
67 lines
1.8 KiB
TypeScript
import { forkJoin, Observable } from 'rxjs'
|
|
import { map, switchMap } from 'rxjs/operators'
|
|
import { Injectable } from '@angular/core'
|
|
import { ServerService } from '@app/core'
|
|
import { CustomMarkupService } from '@app/shared/shared-custom-markup'
|
|
import { AboutHTML, InstanceService } from '@app/shared/shared-instance'
|
|
import { About, ServerStats } from '@peertube/peertube-models'
|
|
|
|
export type ResolverData = {
|
|
serverStats: ServerStats
|
|
about: About
|
|
languages: string[]
|
|
categories: string[]
|
|
aboutHTML: AboutHTML
|
|
descriptionElement: HTMLDivElement
|
|
}
|
|
|
|
@Injectable()
|
|
export class AboutInstanceResolver {
|
|
|
|
constructor (
|
|
private instanceService: InstanceService,
|
|
private customMarkupService: CustomMarkupService,
|
|
private serverService: ServerService
|
|
) {}
|
|
|
|
resolve (): Observable<ResolverData> {
|
|
return forkJoin([
|
|
this.buildInstanceAboutObservable(),
|
|
this.buildInstanceStatsObservable()
|
|
]).pipe(
|
|
map(([
|
|
[ about, languages, categories, aboutHTML, { rootElement } ],
|
|
serverStats
|
|
]) => {
|
|
return {
|
|
serverStats,
|
|
about,
|
|
languages,
|
|
categories,
|
|
aboutHTML,
|
|
descriptionElement: rootElement
|
|
}
|
|
})
|
|
)
|
|
}
|
|
|
|
private buildInstanceAboutObservable () {
|
|
return this.instanceService.getAbout()
|
|
.pipe(
|
|
switchMap(about => {
|
|
return forkJoin([
|
|
Promise.resolve(about),
|
|
this.instanceService.buildTranslatedLanguages(about),
|
|
this.instanceService.buildTranslatedCategories(about),
|
|
this.instanceService.buildHtml(about),
|
|
this.customMarkupService.buildElement(about.instance.description)
|
|
])
|
|
})
|
|
)
|
|
}
|
|
|
|
private buildInstanceStatsObservable () {
|
|
return this.serverService.getServerStats()
|
|
}
|
|
}
|