mirror of
https://github.com/docmost/docmost.git
synced 2025-11-13 00:52:40 +10:00
feat: standalone collab server (#767)
* feat: standalone collab server * * custom collab server port env * fix collab start script command * * API prefix * Log startup PORT * Tweak collab debounce
This commit is contained in:
@ -19,15 +19,13 @@ export function getBackendUrl(): string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function getCollaborationUrl(): string {
|
export function getCollaborationUrl(): string {
|
||||||
const COLLAB_PATH = "/collab";
|
const baseUrl =
|
||||||
|
getConfigValue("COLLAB_URL") ||
|
||||||
|
(import.meta.env.DEV ? process.env.APP_URL : getAppUrl());
|
||||||
|
|
||||||
let url = getAppUrl();
|
const collabUrl = new URL("/collab", baseUrl);
|
||||||
if (import.meta.env.DEV) {
|
collabUrl.protocol = collabUrl.protocol === "https:" ? "wss:" : "ws:";
|
||||||
url = process.env.APP_URL;
|
return collabUrl.toString();
|
||||||
}
|
|
||||||
|
|
||||||
const wsProtocol = url.startsWith("https") ? "wss" : "ws";
|
|
||||||
return `${wsProtocol}://${url.split("://")[1]}${COLLAB_PATH}`;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getAvatarUrl(avatarUrl: string) {
|
export function getAvatarUrl(avatarUrl: string) {
|
||||||
|
|||||||
@ -5,16 +5,21 @@ import * as path from "path";
|
|||||||
export const envPath = path.resolve(process.cwd(), "..", "..");
|
export const envPath = path.resolve(process.cwd(), "..", "..");
|
||||||
|
|
||||||
export default defineConfig(({ mode }) => {
|
export default defineConfig(({ mode }) => {
|
||||||
const { APP_URL, FILE_UPLOAD_SIZE_LIMIT, DRAWIO_URL } = loadEnv(mode, envPath, "");
|
const { APP_URL, FILE_UPLOAD_SIZE_LIMIT, DRAWIO_URL, COLLAB_URL } = loadEnv(
|
||||||
|
mode,
|
||||||
|
envPath,
|
||||||
|
"",
|
||||||
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
define: {
|
define: {
|
||||||
"process.env": {
|
"process.env": {
|
||||||
APP_URL,
|
APP_URL,
|
||||||
FILE_UPLOAD_SIZE_LIMIT,
|
FILE_UPLOAD_SIZE_LIMIT,
|
||||||
DRAWIO_URL
|
DRAWIO_URL,
|
||||||
|
COLLAB_URL,
|
||||||
},
|
},
|
||||||
'APP_VERSION': JSON.stringify(process.env.npm_package_version),
|
APP_VERSION: JSON.stringify(process.env.npm_package_version),
|
||||||
},
|
},
|
||||||
plugins: [react()],
|
plugins: [react()],
|
||||||
resolve: {
|
resolve: {
|
||||||
|
|||||||
@ -12,6 +12,7 @@
|
|||||||
"start:dev": "cross-env NODE_ENV=development nest start --watch",
|
"start:dev": "cross-env NODE_ENV=development nest start --watch",
|
||||||
"start:debug": "cross-env NODE_ENV=development nest start --debug --watch",
|
"start:debug": "cross-env NODE_ENV=development nest start --debug --watch",
|
||||||
"start:prod": "cross-env NODE_ENV=production node dist/main",
|
"start:prod": "cross-env NODE_ENV=production node dist/main",
|
||||||
|
"collab:prod": "cross-env NODE_ENV=production node dist/collaboration/server/collab-main",
|
||||||
"email:dev": "email dev -p 5019 -d ./src/integrations/transactional/emails",
|
"email:dev": "email dev -p 5019 -d ./src/integrations/transactional/emails",
|
||||||
"migration:create": "tsx src/database/migrate.ts create",
|
"migration:create": "tsx src/database/migrate.ts create",
|
||||||
"migration:up": "tsx src/database/migrate.ts up",
|
"migration:up": "tsx src/database/migrate.ts up",
|
||||||
|
|||||||
@ -25,21 +25,25 @@ export class CollaborationGateway {
|
|||||||
this.redisConfig = parseRedisUrl(this.environmentService.getRedisUrl());
|
this.redisConfig = parseRedisUrl(this.environmentService.getRedisUrl());
|
||||||
|
|
||||||
this.hocuspocus = HocuspocusServer.configure({
|
this.hocuspocus = HocuspocusServer.configure({
|
||||||
debounce: 5000,
|
debounce: 10000,
|
||||||
maxDebounce: 10000,
|
maxDebounce: 20000,
|
||||||
unloadImmediately: false,
|
unloadImmediately: false,
|
||||||
extensions: [
|
extensions: [
|
||||||
this.authenticationExtension,
|
this.authenticationExtension,
|
||||||
this.persistenceExtension,
|
this.persistenceExtension,
|
||||||
new Redis({
|
...(this.environmentService.isCollabDisableRedis()
|
||||||
host: this.redisConfig.host,
|
? []
|
||||||
port: this.redisConfig.port,
|
: [
|
||||||
options: {
|
new Redis({
|
||||||
password: this.redisConfig.password,
|
host: this.redisConfig.host,
|
||||||
db: this.redisConfig.db,
|
port: this.redisConfig.port,
|
||||||
retryStrategy: createRetryStrategy(),
|
options: {
|
||||||
},
|
password: this.redisConfig.password,
|
||||||
}),
|
db: this.redisConfig.db,
|
||||||
|
retryStrategy: createRetryStrategy(),
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
]),
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -48,6 +52,14 @@ export class CollaborationGateway {
|
|||||||
this.hocuspocus.handleConnection(client, request);
|
this.hocuspocus.handleConnection(client, request);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getConnectionCount() {
|
||||||
|
return this.hocuspocus.getConnectionsCount();
|
||||||
|
}
|
||||||
|
|
||||||
|
getDocumentCount() {
|
||||||
|
return this.hocuspocus.getDocumentsCount();
|
||||||
|
}
|
||||||
|
|
||||||
async destroy(): Promise<void> {
|
async destroy(): Promise<void> {
|
||||||
await this.hocuspocus.destroy();
|
await this.hocuspocus.destroy();
|
||||||
}
|
}
|
||||||
|
|||||||
23
apps/server/src/collaboration/server/collab-app.module.ts
Normal file
23
apps/server/src/collaboration/server/collab-app.module.ts
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { AppController } from '../../app.controller';
|
||||||
|
import { AppService } from '../../app.service';
|
||||||
|
import { EnvironmentModule } from '../../integrations/environment/environment.module';
|
||||||
|
import { CollaborationModule } from '../collaboration.module';
|
||||||
|
import { DatabaseModule } from '@docmost/db/database.module';
|
||||||
|
import { QueueModule } from '../../integrations/queue/queue.module';
|
||||||
|
import { EventEmitterModule } from '@nestjs/event-emitter';
|
||||||
|
import { HealthModule } from '../../integrations/health/health.module';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [
|
||||||
|
DatabaseModule,
|
||||||
|
EnvironmentModule,
|
||||||
|
CollaborationModule,
|
||||||
|
QueueModule,
|
||||||
|
HealthModule,
|
||||||
|
EventEmitterModule.forRoot(),
|
||||||
|
],
|
||||||
|
controllers: [AppController],
|
||||||
|
providers: [AppService],
|
||||||
|
})
|
||||||
|
export class CollabAppAppModule {}
|
||||||
39
apps/server/src/collaboration/server/collab-main.ts
Normal file
39
apps/server/src/collaboration/server/collab-main.ts
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
import { NestFactory } from '@nestjs/core';
|
||||||
|
import { CollabAppAppModule } from './collab-app.module';
|
||||||
|
import {
|
||||||
|
FastifyAdapter,
|
||||||
|
NestFastifyApplication,
|
||||||
|
} from '@nestjs/platform-fastify';
|
||||||
|
import { TransformHttpResponseInterceptor } from '../../common/interceptors/http-response.interceptor';
|
||||||
|
import { InternalLogFilter } from '../../common/logger/internal-log-filter';
|
||||||
|
import { Logger } from '@nestjs/common';
|
||||||
|
|
||||||
|
async function bootstrap() {
|
||||||
|
const app = await NestFactory.create<NestFastifyApplication>(
|
||||||
|
CollabAppAppModule,
|
||||||
|
new FastifyAdapter({
|
||||||
|
ignoreTrailingSlash: true,
|
||||||
|
ignoreDuplicateSlashes: true,
|
||||||
|
maxParamLength: 500,
|
||||||
|
}),
|
||||||
|
{
|
||||||
|
logger: new InternalLogFilter(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
app.setGlobalPrefix('api', { exclude: ['/'] });
|
||||||
|
|
||||||
|
app.enableCors();
|
||||||
|
|
||||||
|
app.useGlobalInterceptors(new TransformHttpResponseInterceptor());
|
||||||
|
app.enableShutdownHooks();
|
||||||
|
|
||||||
|
const logger = new Logger('CollabServer');
|
||||||
|
|
||||||
|
const port = process.env.COLLAB_PORT || 3001;
|
||||||
|
await app.listen(port, '0.0.0.0', () => {
|
||||||
|
logger.log(`Listening on http://127.0.0.1:${port}`);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
bootstrap();
|
||||||
@ -145,4 +145,15 @@ export class EnvironmentService {
|
|||||||
isSelfHosted(): boolean {
|
isSelfHosted(): boolean {
|
||||||
return !this.isCloud();
|
return !this.isCloud();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getCollabUrl(): string {
|
||||||
|
return this.configService.get<string>('COLLAB_URL');
|
||||||
|
}
|
||||||
|
|
||||||
|
isCollabDisableRedis(): boolean {
|
||||||
|
const isStandalone = this.configService
|
||||||
|
.get<string>('COLLAB_DISABLE_REDIS', 'false')
|
||||||
|
.toLowerCase();
|
||||||
|
return isStandalone === 'true';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,6 +5,7 @@ import {
|
|||||||
IsOptional,
|
IsOptional,
|
||||||
IsUrl,
|
IsUrl,
|
||||||
MinLength,
|
MinLength,
|
||||||
|
ValidateIf,
|
||||||
validateSync,
|
validateSync,
|
||||||
} from 'class-validator';
|
} from 'class-validator';
|
||||||
import { plainToInstance } from 'class-transformer';
|
import { plainToInstance } from 'class-transformer';
|
||||||
@ -48,6 +49,11 @@ export class EnvironmentVariables {
|
|||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsIn(['local', 's3'])
|
@IsIn(['local', 's3'])
|
||||||
STORAGE_DRIVER: string;
|
STORAGE_DRIVER: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@ValidateIf((obj) => obj.COLLAB_URL != '' && obj.COLLAB_URL != null)
|
||||||
|
@IsUrl({ protocols: ['http', 'https'], require_tld: false })
|
||||||
|
COLLAB_URL: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function validate(config: Record<string, any>) {
|
export function validate(config: Record<string, any>) {
|
||||||
|
|||||||
@ -38,6 +38,7 @@ export class StaticModule implements OnModuleInit {
|
|||||||
FILE_UPLOAD_SIZE_LIMIT:
|
FILE_UPLOAD_SIZE_LIMIT:
|
||||||
this.environmentService.getFileUploadSizeLimit(),
|
this.environmentService.getFileUploadSizeLimit(),
|
||||||
DRAWIO_URL: this.environmentService.getDrawioUrl(),
|
DRAWIO_URL: this.environmentService.getDrawioUrl(),
|
||||||
|
COLLAB_URL: this.environmentService.getCollabUrl(),
|
||||||
};
|
};
|
||||||
|
|
||||||
const windowScriptContent = `<script>window.CONFIG=${JSON.stringify(configString)};</script>`;
|
const windowScriptContent = `<script>window.CONFIG=${JSON.stringify(configString)};</script>`;
|
||||||
|
|||||||
@ -6,6 +6,7 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "nx run-many -t build",
|
"build": "nx run-many -t build",
|
||||||
"start": "pnpm --filter ./apps/server run start:prod",
|
"start": "pnpm --filter ./apps/server run start:prod",
|
||||||
|
"collab": "pnpm --filter ./apps/server run collab:prod",
|
||||||
"server:build": "nx run server:build",
|
"server:build": "nx run server:build",
|
||||||
"client:build": "nx run client:build",
|
"client:build": "nx run client:build",
|
||||||
"editor-ext:build": "nx run @docmost/editor-ext:build",
|
"editor-ext:build": "nx run @docmost/editor-ext:build",
|
||||||
|
|||||||
Reference in New Issue
Block a user