diff options
author | Chocobozzz <me@florianbigard.com> | 2023-07-31 14:34:36 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-08-11 15:02:33 +0200 |
commit | 3a4992633ee62d5edfbb484d9c6bcb3cf158489d (patch) | |
tree | e4510b39bdac9c318fdb4b47018d08f15368b8f0 /server/lib/activitypub/collection.ts | |
parent | 04d1da5621d25d59bd5fa1543b725c497bf5d9a8 (diff) | |
download | PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.gz PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.zst PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.zip |
Migrate server to ESM
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)
Diffstat (limited to 'server/lib/activitypub/collection.ts')
-rw-r--r-- | server/lib/activitypub/collection.ts | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/server/lib/activitypub/collection.ts b/server/lib/activitypub/collection.ts deleted file mode 100644 index a176cab51..000000000 --- a/server/lib/activitypub/collection.ts +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | import Bluebird from 'bluebird' | ||
2 | import validator from 'validator' | ||
3 | import { pageToStartAndCount } from '@server/helpers/core-utils' | ||
4 | import { ACTIVITY_PUB } from '@server/initializers/constants' | ||
5 | import { ResultList } from '@shared/models' | ||
6 | import { forceNumber } from '@shared/core-utils' | ||
7 | |||
8 | type ActivityPubCollectionPaginationHandler = (start: number, count: number) => Bluebird<ResultList<any>> | Promise<ResultList<any>> | ||
9 | |||
10 | async function activityPubCollectionPagination ( | ||
11 | baseUrl: string, | ||
12 | handler: ActivityPubCollectionPaginationHandler, | ||
13 | page?: any, | ||
14 | size = ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE | ||
15 | ) { | ||
16 | if (!page || !validator.isInt(page)) { | ||
17 | // We just display the first page URL, we only need the total items | ||
18 | const result = await handler(0, 1) | ||
19 | |||
20 | return { | ||
21 | id: baseUrl, | ||
22 | type: 'OrderedCollection', | ||
23 | totalItems: result.total, | ||
24 | first: result.data.length === 0 | ||
25 | ? undefined | ||
26 | : baseUrl + '?page=1' | ||
27 | } | ||
28 | } | ||
29 | |||
30 | const { start, count } = pageToStartAndCount(page, size) | ||
31 | const result = await handler(start, count) | ||
32 | |||
33 | let next: string | undefined | ||
34 | let prev: string | undefined | ||
35 | |||
36 | // Assert page is a number | ||
37 | page = forceNumber(page) | ||
38 | |||
39 | // There are more results | ||
40 | if (result.total > page * size) { | ||
41 | next = baseUrl + '?page=' + (page + 1) | ||
42 | } | ||
43 | |||
44 | if (page > 1) { | ||
45 | prev = baseUrl + '?page=' + (page - 1) | ||
46 | } | ||
47 | |||
48 | return { | ||
49 | id: baseUrl + '?page=' + page, | ||
50 | type: 'OrderedCollectionPage', | ||
51 | prev, | ||
52 | next, | ||
53 | partOf: baseUrl, | ||
54 | orderedItems: result.data, | ||
55 | totalItems: result.total | ||
56 | } | ||
57 | } | ||
58 | |||
59 | // --------------------------------------------------------------------------- | ||
60 | |||
61 | export { | ||
62 | activityPubCollectionPagination | ||
63 | } | ||