From 3a4992633ee62d5edfbb484d9c6bcb3cf158489d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 31 Jul 2023 14:34:36 +0200 Subject: 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) --- server/models/oauth/oauth-client.ts | 63 ------------------------------------- 1 file changed, 63 deletions(-) delete mode 100644 server/models/oauth/oauth-client.ts (limited to 'server/models/oauth/oauth-client.ts') diff --git a/server/models/oauth/oauth-client.ts b/server/models/oauth/oauth-client.ts deleted file mode 100644 index 457e84613..000000000 --- a/server/models/oauth/oauth-client.ts +++ /dev/null @@ -1,63 +0,0 @@ -import { AllowNull, Column, CreatedAt, DataType, HasMany, Model, Table, UpdatedAt } from 'sequelize-typescript' -import { AttributesOnly } from '@shared/typescript-utils' -import { OAuthTokenModel } from './oauth-token' - -@Table({ - tableName: 'oAuthClient', - indexes: [ - { - fields: [ 'clientId' ], - unique: true - }, - { - fields: [ 'clientId', 'clientSecret' ], - unique: true - } - ] -}) -export class OAuthClientModel extends Model>> { - - @AllowNull(false) - @Column - clientId: string - - @AllowNull(false) - @Column - clientSecret: string - - @Column(DataType.ARRAY(DataType.STRING)) - grants: string[] - - @Column(DataType.ARRAY(DataType.STRING)) - redirectUris: string[] - - @CreatedAt - createdAt: Date - - @UpdatedAt - updatedAt: Date - - @HasMany(() => OAuthTokenModel, { - onDelete: 'cascade' - }) - OAuthTokens: OAuthTokenModel[] - - static countTotal () { - return OAuthClientModel.count() - } - - static loadFirstClient () { - return OAuthClientModel.findOne() - } - - static getByIdAndSecret (clientId: string, clientSecret: string) { - const query = { - where: { - clientId, - clientSecret - } - } - - return OAuthClientModel.findOne(query) - } -} -- cgit v1.2.3