feat: sentry

* Log APP_URL on startup

* add stats endpoint to standalone collab server

apps/client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "client",
   "private": true,
-  "version": "0.8.0",
+  "version": "0.8.3",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",

apps/client/src/lib/config.ts

@@ -19,15 +19,13 @@ export function getBackendUrl(): 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) {

apps/client/vite.config.ts

@@ -5,16 +5,21 @@ import * as path from "path";
 export const envPath = path.resolve(process.cwd(), "..", "..");
 
 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 {
     define: {
       "process.env": {
         APP_URL,
         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()],
     resolve: {

apps/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "server",
-  "version": "0.8.0",
+  "version": "0.8.3",
   "description": "",
   "author": "",
   "private": true,
@@ -12,6 +12,7 @@
     "start:dev": "cross-env NODE_ENV=development nest start --watch",
     "start:debug": "cross-env NODE_ENV=development nest start --debug --watch",
     "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",
     "migration:create": "tsx src/database/migrate.ts create",
     "migration:up": "tsx src/database/migrate.ts up",
@@ -28,47 +29,48 @@
     "test:e2e": "jest --config test/jest-e2e.json"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.701.0",
+    "@aws-sdk/client-s3": "3.701.0",
-    "@aws-sdk/s3-request-presigner": "^3.701.0",
+    "@aws-sdk/s3-request-presigner": "3.701.0",
-    "@casl/ability": "^6.7.2",
+    "@casl/ability": "^6.7.3",
-    "@fastify/cookie": "^9.4.0",
+    "@fastify/cookie": "^11.0.2",
-    "@fastify/multipart": "^8.3.0",
+    "@fastify/multipart": "^9.0.3",
-    "@fastify/static": "^7.0.4",
+    "@fastify/static": "^8.1.1",
-    "@nestjs/bullmq": "^10.2.2",
+    "@nestjs/bullmq": "^11.0.2",
-    "@nestjs/common": "^10.4.9",
+    "@nestjs/common": "^11.0.10",
-    "@nestjs/config": "^3.3.0",
+    "@nestjs/config": "^4.0.0",
-    "@nestjs/core": "^10.4.9",
+    "@nestjs/core": "^11.0.10",
-    "@nestjs/event-emitter": "^2.1.1",
+    "@nestjs/event-emitter": "^3.0.0",
-    "@nestjs/jwt": "^10.2.0",
+    "@nestjs/jwt": "^11.0.0",
-    "@nestjs/mapped-types": "^2.0.6",
+    "@nestjs/mapped-types": "^2.1.0",
-    "@nestjs/passport": "^10.0.3",
+    "@nestjs/passport": "^11.0.5",
-    "@nestjs/platform-fastify": "^10.4.9",
+    "@nestjs/platform-fastify": "^11.0.10",
-    "@nestjs/platform-socket.io": "^10.4.9",
+    "@nestjs/platform-socket.io": "^11.0.10",
-    "@nestjs/terminus": "^10.2.3",
+    "@nestjs/terminus": "^11.0.0",
-    "@nestjs/websockets": "^10.4.9",
+    "@nestjs/websockets": "^11.0.10",
     "@react-email/components": "0.0.28",
-    "@react-email/render": "^1.0.2",
+    "@react-email/render": "1.0.2",
+    "@sentry/nestjs": "^9.2.0",
+    "@sentry/profiling-node": "^9.2.0",
     "@socket.io/redis-adapter": "^8.3.0",
     "bcrypt": "^5.1.1",
-    "bullmq": "^5.29.1",
+    "bullmq": "^5.41.3",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "cookie": "^1.0.2",
     "fix-esm": "^1.0.1",
-    "fs-extra": "^11.2.0",
+    "fs-extra": "^11.3.0",
     "happy-dom": "^15.11.6",
-    "kysely": "^0.27.4",
+    "kysely": "^0.27.5",
     "kysely-migration-cli": "^0.4.2",
     "mime-types": "^2.1.35",
-    "nanoid": "^5.0.9",
+    "nanoid": "^5.1.0",
-    "nestjs-kysely": "^1.0.0",
+    "nestjs-kysely": "^1.1.0",
-    "nodemailer": "^6.9.16",
+    "nodemailer": "^6.10.0",
     "passport-jwt": "^4.0.1",
-    "pg": "^8.13.1",
+    "pg": "^8.13.3",
     "pg-tsquery": "^8.4.2",
     "postmark": "^4.0.5",
     "react": "^18.3.1",
-    "redis": "^4.7.0",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
     "sanitize-filename-ts": "^1.0.2",
@@ -76,36 +78,36 @@
     "ws": "^8.18.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.16.0",
+    "@eslint/js": "^9.20.0",
-    "@nestjs/cli": "^10.4.8",
+    "@nestjs/cli": "^11.0.4",
-    "@nestjs/schematics": "^10.2.3",
+    "@nestjs/schematics": "^11.0.1",
-    "@nestjs/testing": "^10.4.9",
+    "@nestjs/testing": "^11.0.10",
     "@types/bcrypt": "^5.0.2",
     "@types/debounce": "^1.2.4",
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.14",
     "@types/mime-types": "^2.1.4",
-    "@types/node": "^22.10.0",
+    "@types/node": "^22.13.4",
     "@types/nodemailer": "^6.4.17",
     "@types/passport-jwt": "^4.0.1",
-    "@types/pg": "^8.11.10",
+    "@types/pg": "^8.11.11",
     "@types/supertest": "^6.0.2",
-    "@types/ws": "^8.5.13",
+    "@types/ws": "^8.5.14",
-    "eslint": "^9.15.0",
+    "eslint": "^9.20.1",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-prettier": "^10.0.1",
-    "globals": "^15.13.0",
+    "globals": "^15.15.0",
     "jest": "^29.7.0",
     "kysely-codegen": "^0.17.0",
-    "prettier": "^3.4.1",
+    "prettier": "^3.5.1",
-    "react-email": "^3.0.2",
+    "react-email": "3.0.2",
     "source-map-support": "^0.5.21",
     "supertest": "^7.0.0",
     "ts-jest": "^29.2.5",
-    "ts-loader": "^9.5.1",
+    "ts-loader": "^9.5.2",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.7.2",
+    "typescript": "^5.7.3",
-    "typescript-eslint": "^8.17.0"
+    "typescript-eslint": "^8.24.1"
   },
   "jest": {
     "moduleFileExtensions": [

apps/server/src/app.module.ts

@@ -14,9 +14,11 @@ import { EventEmitterModule } from '@nestjs/event-emitter';
 import { HealthModule } from './integrations/health/health.module';
 import { ExportModule } from './integrations/export/export.module';
 import { ImportModule } from './integrations/import/import.module';
+import { SentryModule } from "@sentry/nestjs/setup";
 
 @Module({
   imports: [
+    SentryModule.forRoot(),
     CoreModule,
     DatabaseModule,
     EnvironmentModule,

apps/server/src/collaboration/collaboration.gateway.ts

@@ -25,21 +25,25 @@ export class CollaborationGateway {
     this.redisConfig = parseRedisUrl(this.environmentService.getRedisUrl());
 
     this.hocuspocus = HocuspocusServer.configure({
-      debounce: 5000,
+      debounce: 10000,
-      maxDebounce: 10000,
+      maxDebounce: 20000,
       unloadImmediately: false,
       extensions: [
         this.authenticationExtension,
         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);
   }
 
+  getConnectionCount() {
+    return this.hocuspocus.getConnectionsCount();
+  }
+
+  getDocumentCount() {
+    return this.hocuspocus.getDocumentsCount();
+  }
+
   async destroy(): Promise<void> {
     await this.hocuspocus.destroy();
   }

apps/server/src/collaboration/collaboration.module.ts

@@ -16,6 +16,7 @@ import { HistoryListener } from './listeners/history.listener';
     PersistenceExtension,
     HistoryListener,
   ],
+  exports: [CollaborationGateway],
   imports: [TokenModule],
 })
 export class CollaborationModule implements OnModuleInit, OnModuleDestroy {

apps/server/src/collaboration/server/collab-app.module.ts

@@ -0,0 +1,31 @@
+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';
+import { CollaborationController } from './collaboration.controller';
+import { SentryModule } from "@sentry/nestjs/setup";
+
+@Module({
+  imports: [
+    SentryModule.forRoot(),
+    DatabaseModule,
+    EnvironmentModule,
+    CollaborationModule,
+    QueueModule,
+    HealthModule,
+    EventEmitterModule.forRoot(),
+  ],
+  controllers: [
+    AppController,
+    ...(process.env.COLLAB_SHOW_STATS.toLowerCase() === 'true'
+      ? [CollaborationController]
+      : []),
+  ],
+  providers: [AppService],
+})
+export class CollabAppModule {}

apps/server/src/collaboration/server/collab-main.ts

@@ -0,0 +1,40 @@
+import "./common/sentry/instrument";
+import { NestFactory } from '@nestjs/core';
+import { CollabAppModule } 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>(
+    CollabAppModule,
+    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();

apps/server/src/collaboration/server/collaboration.controller.ts

@@ -0,0 +1,15 @@
+import { Controller, Get } from '@nestjs/common';
+import { CollaborationGateway } from '../collaboration.gateway';
+
+@Controller('collab')
+export class CollaborationController {
+  constructor(private readonly collaborationGateway: CollaborationGateway) {}
+
+  @Get('stats')
+  async getStats() {
+    return {
+      connections: this.collaborationGateway.getConnectionCount(),
+      documents: this.collaborationGateway.getDocumentCount(),
+    };
+  }
+}

apps/server/src/common/sentry/instrument.ts

@@ -0,0 +1,16 @@
+import * as Sentry from '@sentry/nestjs';
+import { nodeProfilingIntegration } from '@sentry/profiling-node';
+import { envPath } from '../helpers';
+import * as dotenv from 'dotenv';
+dotenv.config({ path: envPath });
+
+if (process.env.SENTRY_DSN) {
+  Sentry.init({
+    dsn: process.env.SENTRY_DSN,
+    integrations: [
+      nodeProfilingIntegration(),
+    ],
+    tracesSampleRate: 1.0,
+    profilesSampleRate: 1.0,
+  });
+}

apps/server/src/core/auth/services/signup.service.ts

@@ -79,7 +79,7 @@ export class SignupService {
         const user = await this.userRepo.insertUser(
           {
             name: createAdminUserDto.name,
-            email: createAdminUserDto.name,
+            email: createAdminUserDto.email,
             password: createAdminUserDto.password,
             role: UserRole.OWNER,
             emailVerifiedAt: new Date(),

apps/server/src/core/workspace/services/workspace-invitation.service.ts

@@ -16,7 +16,6 @@ import {
 } from '@docmost/db/types/entity.types';
 import { MailService } from '../../../integrations/mail/mail.service';
 import InvitationEmail from '@docmost/transactional/emails/invitation-email';
-import { hashPassword } from '../../../common/helpers';
 import { GroupUserRepo } from '@docmost/db/repos/group/group-user.repo';
 import InvitationAcceptedEmail from '@docmost/transactional/emails/invitation-accepted-email';
 import { EnvironmentService } from '../../../integrations/environment/environment.service';
@@ -163,7 +162,6 @@ export class WorkspaceInvitationService {
       throw new BadRequestException('Invalid invitation token');
     }
 
-    const password = await hashPassword(dto.password);
     let newUser: User;
 
     try {
@@ -173,7 +171,7 @@ export class WorkspaceInvitationService {
             name: dto.name,
             email: invitation.email,
             emailVerifiedAt: new Date(),
-            password: password,
+            password: dto.password,
             role: invitation.role,
             invitedById: invitation.invitedById,
             workspaceId: workspaceId,

apps/server/src/integrations/environment/environment.service.ts

@@ -145,4 +145,15 @@ export class EnvironmentService {
   isSelfHosted(): boolean {
     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';
+  }
 }

apps/server/src/integrations/environment/environment.validation.ts

@@ -5,6 +5,7 @@ import {
   IsOptional,
   IsUrl,
   MinLength,
+  ValidateIf,
   validateSync,
 } from 'class-validator';
 import { plainToInstance } from 'class-transformer';
@@ -48,6 +49,11 @@ export class EnvironmentVariables {
   @IsOptional()
   @IsIn(['local', 's3'])
   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>) {

apps/server/src/integrations/health/postgres.health.ts

@@ -1,31 +1,30 @@
 import { InjectKysely } from 'nestjs-kysely';
 import {
-  HealthCheckError,
-  HealthIndicator,
   HealthIndicatorResult,
+  HealthIndicatorService,
 } from '@nestjs/terminus';
 import { Injectable, Logger } from '@nestjs/common';
 import { sql } from 'kysely';
 import { KyselyDB } from '@docmost/db/types/kysely.types';
 
 @Injectable()
-export class PostgresHealthIndicator extends HealthIndicator {
+export class PostgresHealthIndicator {
   private readonly logger = new Logger(PostgresHealthIndicator.name);
 
-  constructor(@InjectKysely() private readonly db: KyselyDB) {
+  constructor(
-    super();
+    private readonly healthIndicatorService: HealthIndicatorService,
-  }
+    @InjectKysely() private readonly db: KyselyDB,
+  ) {}
 
   async pingCheck(key: string): Promise<HealthIndicatorResult> {
+    const indicator = this.healthIndicatorService.check(key);
+
     try {
       await sql`SELECT 1=1`.execute(this.db);
-      return this.getStatus(key, true);
+      return indicator.up();
     } catch (e) {
       this.logger.error(JSON.stringify(e));
-      throw new HealthCheckError(
+      return indicator.down(`${key} is not available`);
-        `${key} is not available`,
-        this.getStatus(key, false),
-      );
     }
   }
 }

apps/server/src/integrations/health/redis.health.ts

@@ -1,21 +1,23 @@
 import {
-  HealthCheckError,
-  HealthIndicator,
   HealthIndicatorResult,
+  HealthIndicatorService,
 } from '@nestjs/terminus';
 import { Injectable, Logger } from '@nestjs/common';
 import { EnvironmentService } from '../environment/environment.service';
 import { Redis } from 'ioredis';
 
 @Injectable()
-export class RedisHealthIndicator extends HealthIndicator {
+export class RedisHealthIndicator {
   private readonly logger = new Logger(RedisHealthIndicator.name);
 
-  constructor(private environmentService: EnvironmentService) {
+  constructor(
-    super();
+    private readonly healthIndicatorService: HealthIndicatorService,
-  }
+    private environmentService: EnvironmentService,
+  ) {}
 
   async pingCheck(key: string): Promise<HealthIndicatorResult> {
+    const indicator = this.healthIndicatorService.check(key);
+
     try {
       const redis = new Redis(this.environmentService.getRedisUrl(), {
         maxRetriesPerRequest: 15,
@@ -23,13 +25,10 @@ export class RedisHealthIndicator extends HealthIndicator {
 
       await redis.ping();
       redis.disconnect();
-      return this.getStatus(key, true);
+      return indicator.up();
     } catch (e) {
       this.logger.error(e);
-      throw new HealthCheckError(
+      return indicator.down(`${key} is not available`);
-        `${key} is not available`,
-        this.getStatus(key, false),
-      );
     }
   }
 }

apps/server/src/integrations/static/static.module.ts

@@ -38,6 +38,7 @@ export class StaticModule implements OnModuleInit {
         FILE_UPLOAD_SIZE_LIMIT:
           this.environmentService.getFileUploadSizeLimit(),
         DRAWIO_URL: this.environmentService.getDrawioUrl(),
+        COLLAB_URL: this.environmentService.getCollabUrl(),
       };
 
       const windowScriptContent = `<script>window.CONFIG=${JSON.stringify(configString)};</script>`;

apps/server/src/main.ts

@@ -1,10 +1,11 @@
+import "./common/sentry/instrument";
 import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app.module';
 import {
   FastifyAdapter,
   NestFastifyApplication,
 } from '@nestjs/platform-fastify';
-import { NotFoundException, ValidationPipe } from '@nestjs/common';
+import { Logger, NotFoundException, ValidationPipe } from '@nestjs/common';
 import { TransformHttpResponseInterceptor } from './common/interceptors/http-response.interceptor';
 import fastifyMultipart from '@fastify/multipart';
 import { WsRedisIoAdapter } from './ws/adapter/ws-redis.adapter';
@@ -18,6 +19,7 @@ async function bootstrap() {
       ignoreTrailingSlash: true,
       ignoreDuplicateSlashes: true,
       maxParamLength: 500,
+      trustProxy: true,
     }),
     {
       logger: new InternalLogFilter(),
@@ -65,7 +67,14 @@ async function bootstrap() {
   app.useGlobalInterceptors(new TransformHttpResponseInterceptor());
   app.enableShutdownHooks();
 
-  await app.listen(process.env.PORT || 3000, '0.0.0.0');
+  const logger = new Logger('NestApplication');
+
+  const port = process.env.PORT || 3000;
+  await app.listen(port, '0.0.0.0', () => {
+    logger.log(
+      `Listening on http://127.0.0.1:${port} / ${process.env.APP_URL}`,
+    );
+  });
 }
 
 bootstrap();

package.json

@@ -1,11 +1,12 @@
 {
   "name": "docmost",
   "homepage": "https://docmost.com",
-  "version": "0.8.0",
+  "version": "0.8.3",
   "private": true,
   "scripts": {
     "build": "nx run-many -t build",
     "start": "pnpm --filter ./apps/server run start:prod",
+    "collab": "pnpm --filter ./apps/server run collab:prod",
     "server:build": "nx run server:build",
     "client:build": "nx run client:build",
     "editor-ext:build": "nx run @docmost/editor-ext:build",
@@ -61,23 +62,23 @@
     "bytes": "^3.1.2",
     "cross-env": "^7.0.3",
     "date-fns": "^4.1.0",
-    "dompurify": "^3.2.1",
+    "dompurify": "^3.2.4",
     "fractional-indexing-jittered": "^1.0.0",
     "ioredis": "^5.4.1",
     "jszip": "^3.10.1",
     "linkifyjs": "^4.2.0",
     "marked": "^13.0.3",
-    "uuid": "^11.0.3",
+    "uuid": "^11.1.0",
     "y-indexeddb": "^9.0.12",
     "yjs": "^13.6.20"
   },
   "devDependencies": {
-    "@nx/js": "20.1.3",
+    "@nx/js": "20.4.5",
-    "@types/bytes": "^3.1.4",
+    "@types/bytes": "^3.1.5",
     "@types/uuid": "^10.0.0",
-    "concurrently": "^9.1.0",
+    "concurrently": "^9.1.2",
-    "nx": "20.1.3",
+    "nx": "20.4.5",
-    "tsx": "^4.19.2"
+    "tsx": "^4.19.3"
   },
   "workspaces": {
     "packages": [