mirror of
https://github.com/docmost/docmost.git
synced 2026-05-07 06:23:06 +08:00
Merge branch 'main' into watchers-notify
This commit is contained in:
@@ -10,7 +10,7 @@ import { useCallback } from "react";
|
|||||||
export default function AttachmentView(props: NodeViewProps) {
|
export default function AttachmentView(props: NodeViewProps) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const { editor, node, getPos, selected } = props;
|
const { editor, node, getPos, selected } = props;
|
||||||
const { url, name, size, mime, attachmentId } = node.attrs;
|
const { url, name, size, mime, attachmentId, placeholder } = node.attrs;
|
||||||
const { hovered, ref } = useHover();
|
const { hovered, ref } = useHover();
|
||||||
|
|
||||||
const isPdf = mime === "application/pdf" || name?.toLowerCase().endsWith(".pdf");
|
const isPdf = mime === "application/pdf" || name?.toLowerCase().endsWith(".pdf");
|
||||||
@@ -49,14 +49,14 @@ export default function AttachmentView(props: NodeViewProps) {
|
|||||||
h={25}
|
h={25}
|
||||||
>
|
>
|
||||||
<Group wrap="nowrap" gap="sm" style={{ minWidth: 0, flex: 1 }}>
|
<Group wrap="nowrap" gap="sm" style={{ minWidth: 0, flex: 1 }}>
|
||||||
{url ? (
|
{!url && placeholder ? (
|
||||||
<IconPaperclip size={20} style={{ flexShrink: 0 }} />
|
|
||||||
) : (
|
|
||||||
<Loader size={20} style={{ flexShrink: 0 }} />
|
<Loader size={20} style={{ flexShrink: 0 }} />
|
||||||
|
) : (
|
||||||
|
<IconPaperclip size={20} style={{ flexShrink: 0 }} />
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<Text component="span" size="md" truncate="end" style={{ minWidth: 0 }}>
|
<Text component="span" size="md" truncate="end" style={{ minWidth: 0 }}>
|
||||||
{url ? name : t("Uploading {{name}}", { name })}
|
{!url && placeholder ? t("Uploading {{name}}", { name }) : name}
|
||||||
</Text>
|
</Text>
|
||||||
|
|
||||||
<Text component="span" size="sm" c="dimmed" style={{ flexShrink: 0 }}>
|
<Text component="span" size="sm" c="dimmed" style={{ flexShrink: 0 }}>
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ export default function AudioView(props: NodeViewProps) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<NodeViewWrapper data-drag-handle>
|
<NodeViewWrapper data-drag-handle>
|
||||||
<div className={`${classes.audioWrapper} ${!safeSrc ? classes.skeleton : ''}`}>
|
<div className={`${classes.audioWrapper} ${!safeSrc && placeholder ? classes.skeleton : ''}`}>
|
||||||
{safeSrc && (
|
{safeSrc && (
|
||||||
<audio
|
<audio
|
||||||
className={classes.audio}
|
className={classes.audio}
|
||||||
@@ -49,7 +49,7 @@ export default function AudioView(props: NodeViewProps) {
|
|||||||
<Loader size={20} pos="absolute" top={6} right={6} />
|
<Loader size={20} pos="absolute" top={6} right={6} />
|
||||||
</Group>
|
</Group>
|
||||||
)}
|
)}
|
||||||
{!safeSrc && !previewSrc && (
|
{!safeSrc && !previewSrc && placeholder && (
|
||||||
<Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md" h={54}>
|
<Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md" h={54}>
|
||||||
<Loader size={20} style={{ flexShrink: 0 }} />
|
<Loader size={20} style={{ flexShrink: 0 }} />
|
||||||
<Text component="span" size="sm" truncate="end">
|
<Text component="span" size="sm" truncate="end">
|
||||||
@@ -59,6 +59,9 @@ export default function AudioView(props: NodeViewProps) {
|
|||||||
</Text>
|
</Text>
|
||||||
</Group>
|
</Group>
|
||||||
)}
|
)}
|
||||||
|
{!safeSrc && !previewSrc && !placeholder && (
|
||||||
|
<audio className={classes.audio} controls />
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</NodeViewWrapper>
|
</NodeViewWrapper>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ export default function ImageView(props: NodeViewProps) {
|
|||||||
className={clsx(
|
className={clsx(
|
||||||
selected && "ProseMirror-selectednode",
|
selected && "ProseMirror-selectednode",
|
||||||
classes.imageWrapper,
|
classes.imageWrapper,
|
||||||
!src && classes.skeleton,
|
!src && placeholder && classes.skeleton,
|
||||||
alignClass,
|
alignClass,
|
||||||
)}
|
)}
|
||||||
style={{
|
style={{
|
||||||
@@ -55,7 +55,7 @@ export default function ImageView(props: NodeViewProps) {
|
|||||||
<Loader size={20} pos="absolute" bottom={6} right={6} />
|
<Loader size={20} pos="absolute" bottom={6} right={6} />
|
||||||
</Group>
|
</Group>
|
||||||
)}
|
)}
|
||||||
{!src && !previewSrc && (
|
{!src && !previewSrc && placeholder && (
|
||||||
<Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md">
|
<Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md">
|
||||||
<Loader size={20} style={{ flexShrink: 0 }} />
|
<Loader size={20} style={{ flexShrink: 0 }} />
|
||||||
<Text component="span" size="sm" truncate="end">
|
<Text component="span" size="sm" truncate="end">
|
||||||
|
|||||||
@@ -73,7 +73,8 @@ export default function PdfView(props: NodeViewProps) {
|
|||||||
if (!src || !safeSrc) {
|
if (!src || !safeSrc) {
|
||||||
return (
|
return (
|
||||||
<NodeViewWrapper data-drag-handle>
|
<NodeViewWrapper data-drag-handle>
|
||||||
<div className={`${classes.pdfWrapper} ${classes.skeleton}`} style={{ height: 600 }}>
|
<div className={`${classes.pdfWrapper} ${placeholder ? classes.skeleton : ''}`} style={{ height: placeholder ? 600 : undefined }}>
|
||||||
|
{placeholder && (
|
||||||
<Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md">
|
<Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md">
|
||||||
<Loader size={20} style={{ flexShrink: 0 }} />
|
<Loader size={20} style={{ flexShrink: 0 }} />
|
||||||
<Text component="span" size="sm" truncate="end">
|
<Text component="span" size="sm" truncate="end">
|
||||||
@@ -82,6 +83,7 @@ export default function PdfView(props: NodeViewProps) {
|
|||||||
: t("Uploading file")}
|
: t("Uploading file")}
|
||||||
</Text>
|
</Text>
|
||||||
</Group>
|
</Group>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</NodeViewWrapper>
|
</NodeViewWrapper>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ export default function VideoView(props: NodeViewProps) {
|
|||||||
className={clsx(
|
className={clsx(
|
||||||
selected && "ProseMirror-selectednode",
|
selected && "ProseMirror-selectednode",
|
||||||
classes.videoWrapper,
|
classes.videoWrapper,
|
||||||
!src && classes.skeleton,
|
!src && placeholder && classes.skeleton,
|
||||||
alignClass,
|
alignClass,
|
||||||
)}
|
)}
|
||||||
style={{
|
style={{
|
||||||
@@ -60,7 +60,7 @@ export default function VideoView(props: NodeViewProps) {
|
|||||||
<Loader size={20} pos="absolute" top={6} right={6} />
|
<Loader size={20} pos="absolute" top={6} right={6} />
|
||||||
</Group>
|
</Group>
|
||||||
)}
|
)}
|
||||||
{!src && !previewSrc && (
|
{!src && !previewSrc && placeholder && (
|
||||||
<Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md">
|
<Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md">
|
||||||
<Loader size={20} style={{ flexShrink: 0 }} />
|
<Loader size={20} style={{ flexShrink: 0 }} />
|
||||||
<Text component="span" size="sm" truncate="end">
|
<Text component="span" size="sm" truncate="end">
|
||||||
@@ -70,6 +70,9 @@ export default function VideoView(props: NodeViewProps) {
|
|||||||
</Text>
|
</Text>
|
||||||
</Group>
|
</Group>
|
||||||
)}
|
)}
|
||||||
|
{!src && !previewSrc && !placeholder && (
|
||||||
|
<video className={classes.video} controls />
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</NodeViewWrapper>
|
</NodeViewWrapper>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -253,8 +253,8 @@ export const mainExtensions = [
|
|||||||
resize: {
|
resize: {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
directions: ["left", "right"],
|
directions: ["left", "right"],
|
||||||
minWidth: 80,
|
minWidth: 24,
|
||||||
minHeight: 40,
|
minHeight: 16,
|
||||||
alwaysPreserveAspectRatio: true,
|
alwaysPreserveAspectRatio: true,
|
||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
createCustomHandle: createImageHandle,
|
createCustomHandle: createImageHandle,
|
||||||
@@ -266,8 +266,8 @@ export const mainExtensions = [
|
|||||||
resize: {
|
resize: {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
directions: ["left", "right"],
|
directions: ["left", "right"],
|
||||||
minWidth: 80,
|
minWidth: 24,
|
||||||
minHeight: 40,
|
minHeight: 16,
|
||||||
alwaysPreserveAspectRatio: true,
|
alwaysPreserveAspectRatio: true,
|
||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
createCustomHandle: createResizeHandle,
|
createCustomHandle: createResizeHandle,
|
||||||
@@ -297,8 +297,8 @@ export const mainExtensions = [
|
|||||||
resize: {
|
resize: {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
directions: ["left", "right"],
|
directions: ["left", "right"],
|
||||||
minWidth: 80,
|
minWidth: 24,
|
||||||
minHeight: 40,
|
minHeight: 16,
|
||||||
alwaysPreserveAspectRatio: true,
|
alwaysPreserveAspectRatio: true,
|
||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
createCustomHandle: createResizeHandle,
|
createCustomHandle: createResizeHandle,
|
||||||
@@ -310,8 +310,8 @@ export const mainExtensions = [
|
|||||||
resize: {
|
resize: {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
directions: ["left", "right"],
|
directions: ["left", "right"],
|
||||||
minWidth: 80,
|
minWidth: 24,
|
||||||
minHeight: 40,
|
minHeight: 16,
|
||||||
alwaysPreserveAspectRatio: true,
|
alwaysPreserveAspectRatio: true,
|
||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
createCustomHandle: createResizeHandle,
|
createCustomHandle: createResizeHandle,
|
||||||
|
|||||||
@@ -44,6 +44,7 @@
|
|||||||
"@langchain/core": "1.1.34",
|
"@langchain/core": "1.1.34",
|
||||||
"@langchain/textsplitters": "1.0.1",
|
"@langchain/textsplitters": "1.0.1",
|
||||||
"@modelcontextprotocol/sdk": "^1.27.1",
|
"@modelcontextprotocol/sdk": "^1.27.1",
|
||||||
|
"@nest-lab/throttler-storage-redis": "^1.2.0",
|
||||||
"@nestjs-labs/nestjs-ioredis": "^11.0.4",
|
"@nestjs-labs/nestjs-ioredis": "^11.0.4",
|
||||||
"@nestjs/bullmq": "^11.0.4",
|
"@nestjs/bullmq": "^11.0.4",
|
||||||
"@nestjs/cache-manager": "^3.1.0",
|
"@nestjs/cache-manager": "^3.1.0",
|
||||||
@@ -58,6 +59,7 @@
|
|||||||
"@nestjs/platform-socket.io": "^11.1.17",
|
"@nestjs/platform-socket.io": "^11.1.17",
|
||||||
"@nestjs/schedule": "^6.1.1",
|
"@nestjs/schedule": "^6.1.1",
|
||||||
"@nestjs/terminus": "^11.1.1",
|
"@nestjs/terminus": "^11.1.1",
|
||||||
|
"@nestjs/throttler": "^6.5.0",
|
||||||
"@nestjs/websockets": "^11.1.17",
|
"@nestjs/websockets": "^11.1.17",
|
||||||
"@node-saml/passport-saml": "^5.1.0",
|
"@node-saml/passport-saml": "^5.1.0",
|
||||||
"@react-email/components": "1.0.10",
|
"@react-email/components": "1.0.10",
|
||||||
@@ -73,6 +75,7 @@
|
|||||||
"class-transformer": "^0.5.1",
|
"class-transformer": "^0.5.1",
|
||||||
"class-validator": "^0.15.1",
|
"class-validator": "^0.15.1",
|
||||||
"cookie": "^1.1.1",
|
"cookie": "^1.1.1",
|
||||||
|
"fastify-ip": "^2.0.0",
|
||||||
"fs-extra": "^11.3.4",
|
"fs-extra": "^11.3.4",
|
||||||
"happy-dom": "20.8.9",
|
"happy-dom": "20.8.9",
|
||||||
"ioredis": "^5.10.1",
|
"ioredis": "^5.10.1",
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import KeyvRedis from '@keyv/redis';
|
|||||||
import { LoggerModule } from './common/logger/logger.module';
|
import { LoggerModule } from './common/logger/logger.module';
|
||||||
import { ClsModule } from 'nestjs-cls';
|
import { ClsModule } from 'nestjs-cls';
|
||||||
import { NoopAuditModule } from './integrations/audit/audit.module';
|
import { NoopAuditModule } from './integrations/audit/audit.module';
|
||||||
|
import { ThrottleModule } from './integrations/throttle/throttle.module';
|
||||||
|
|
||||||
const enterpriseModules = [];
|
const enterpriseModules = [];
|
||||||
try {
|
try {
|
||||||
@@ -83,6 +84,7 @@ try {
|
|||||||
EventEmitterModule.forRoot(),
|
EventEmitterModule.forRoot(),
|
||||||
SecurityModule,
|
SecurityModule,
|
||||||
TelemetryModule,
|
TelemetryModule,
|
||||||
|
ThrottleModule,
|
||||||
...enterpriseModules,
|
...enterpriseModules,
|
||||||
],
|
],
|
||||||
controllers: [AppController],
|
controllers: [AppController],
|
||||||
|
|||||||
@@ -50,20 +50,12 @@ export function createPinoConfig(): Params {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
serializers: {
|
serializers: {
|
||||||
req: (req) => {
|
req: (req) => ({
|
||||||
const forwardedFor = req.headers?.['x-forwarded-for'];
|
|
||||||
const ip =
|
|
||||||
req.headers?.['cf-connecting-ip'] ||
|
|
||||||
(typeof forwardedFor === 'string' ? forwardedFor.split(',')[0]?.trim() : undefined) ||
|
|
||||||
req.remoteAddress;
|
|
||||||
|
|
||||||
return {
|
|
||||||
method: req.method,
|
method: req.method,
|
||||||
url: req.url,
|
url: req.url,
|
||||||
ip,
|
ip: req.ip || req.remoteAddress,
|
||||||
userAgent: req.headers?.['user-agent'],
|
userAgent: req.headers?.['user-agent'],
|
||||||
};
|
}),
|
||||||
},
|
|
||||||
res: (res) => ({
|
res: (res) => ({
|
||||||
statusCode: res.statusCode,
|
statusCode: res.statusCode,
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -18,7 +18,8 @@ export class AuditContextMiddleware implements NestMiddleware {
|
|||||||
|
|
||||||
use(req: FastifyRequest['raw'], res: FastifyReply['raw'], next: () => void) {
|
use(req: FastifyRequest['raw'], res: FastifyReply['raw'], next: () => void) {
|
||||||
const workspaceId = (req as any).workspaceId ?? null;
|
const workspaceId = (req as any).workspaceId ?? null;
|
||||||
const ipAddress = this.extractIpAddress(req);
|
|
||||||
|
const ipAddress = (req as any).ip ?? (req as any).socket?.remoteAddress ?? null;
|
||||||
|
|
||||||
const userAgent =
|
const userAgent =
|
||||||
(req.headers['user-agent'] as string) ?? null;
|
(req.headers['user-agent'] as string) ?? null;
|
||||||
@@ -35,21 +36,4 @@ export class AuditContextMiddleware implements NestMiddleware {
|
|||||||
|
|
||||||
next();
|
next();
|
||||||
}
|
}
|
||||||
|
|
||||||
private extractIpAddress(req: FastifyRequest['raw']): string | null {
|
|
||||||
const xForwardedFor = req.headers['x-forwarded-for'];
|
|
||||||
if (xForwardedFor) {
|
|
||||||
const ips = Array.isArray(xForwardedFor)
|
|
||||||
? xForwardedFor[0]
|
|
||||||
: xForwardedFor.split(',')[0];
|
|
||||||
return ips?.trim() ?? null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const xRealIp = req.headers['x-real-ip'];
|
|
||||||
if (xRealIp) {
|
|
||||||
return Array.isArray(xRealIp) ? xRealIp[0] : xRealIp;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (req as any).socket?.remoteAddress ?? null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import {
|
|||||||
UseGuards,
|
UseGuards,
|
||||||
Logger,
|
Logger,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
|
import { SkipThrottle, ThrottlerGuard } from '@nestjs/throttler';
|
||||||
import { LoginDto } from './dto/login.dto';
|
import { LoginDto } from './dto/login.dto';
|
||||||
import { AuthService } from './services/auth.service';
|
import { AuthService } from './services/auth.service';
|
||||||
import { SessionService } from '../session/session.service';
|
import { SessionService } from '../session/session.service';
|
||||||
@@ -33,6 +34,7 @@ import {
|
|||||||
IAuditService,
|
IAuditService,
|
||||||
} from '../../integrations/audit/audit.service';
|
} from '../../integrations/audit/audit.service';
|
||||||
|
|
||||||
|
@UseGuards(ThrottlerGuard)
|
||||||
@Controller('auth')
|
@Controller('auth')
|
||||||
export class AuthController {
|
export class AuthController {
|
||||||
private readonly logger = new Logger(AuthController.name);
|
private readonly logger = new Logger(AuthController.name);
|
||||||
@@ -111,6 +113,7 @@ export class AuthController {
|
|||||||
return workspace;
|
return workspace;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SkipThrottle()
|
||||||
@UseGuards(JwtAuthGuard)
|
@UseGuards(JwtAuthGuard)
|
||||||
@HttpCode(HttpStatus.OK)
|
@HttpCode(HttpStatus.OK)
|
||||||
@Post('change-password')
|
@Post('change-password')
|
||||||
@@ -173,6 +176,7 @@ export class AuthController {
|
|||||||
return this.authService.verifyUserToken(verifyUserTokenDto, workspace.id);
|
return this.authService.verifyUserToken(verifyUserTokenDto, workspace.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SkipThrottle()
|
||||||
@UseGuards(JwtAuthGuard)
|
@UseGuards(JwtAuthGuard)
|
||||||
@HttpCode(HttpStatus.OK)
|
@HttpCode(HttpStatus.OK)
|
||||||
@Post('collab-token')
|
@Post('collab-token')
|
||||||
@@ -183,6 +187,7 @@ export class AuthController {
|
|||||||
return this.authService.getCollabToken(user, workspace.id);
|
return this.authService.getCollabToken(user, workspace.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SkipThrottle()
|
||||||
@UseGuards(JwtAuthGuard)
|
@UseGuards(JwtAuthGuard)
|
||||||
@HttpCode(HttpStatus.OK)
|
@HttpCode(HttpStatus.OK)
|
||||||
@Post('logout')
|
@Post('logout')
|
||||||
|
|||||||
+1
-1
Submodule apps/server/src/ee updated: 05f1c816a8...350ef574e3
@@ -193,6 +193,8 @@ export class ImportAttachmentService {
|
|||||||
// Build a map from resolved archive path → real filename from Confluence
|
// Build a map from resolved archive path → real filename from Confluence
|
||||||
// metadata. Confluence Server archives often store files under numeric IDs
|
// metadata. Confluence Server archives often store files under numeric IDs
|
||||||
// (e.g. "attachments/65601/65602") instead of the original filename.
|
// (e.g. "attachments/65601/65602") instead of the original filename.
|
||||||
|
// Also register aliases so HTML references using the original filename
|
||||||
|
// (e.g. "attachments/pageId/original.mp3") resolve to the numeric path.
|
||||||
const pageDir = path.dirname(pageRelativePath);
|
const pageDir = path.dirname(pageRelativePath);
|
||||||
const attachmentNameByRelPath = new Map<string, string>();
|
const attachmentNameByRelPath = new Map<string, string>();
|
||||||
for (const attachment of pageAttachments) {
|
for (const attachment of pageAttachments) {
|
||||||
@@ -203,6 +205,13 @@ export class ImportAttachmentService {
|
|||||||
);
|
);
|
||||||
if (relPath && attachment.fileName) {
|
if (relPath && attachment.fileName) {
|
||||||
attachmentNameByRelPath.set(relPath, attachment.fileName);
|
attachmentNameByRelPath.set(relPath, attachment.fileName);
|
||||||
|
|
||||||
|
const dir = path.posix.dirname(relPath);
|
||||||
|
const aliasKey = `${dir}/${attachment.fileName}`;
|
||||||
|
if (!attachmentCandidates.has(aliasKey)) {
|
||||||
|
attachmentCandidates.set(aliasKey, attachmentCandidates.get(relPath)!);
|
||||||
|
attachmentNameByRelPath.set(aliasKey, attachment.fileName);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -562,18 +571,31 @@ export class ImportAttachmentService {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if already processed (was referenced in HTML)
|
// Resolve the metadata href to the actual archive path
|
||||||
if (processed.has(href)) {
|
const resolvedHref = resolveRelativeAttachmentPath(
|
||||||
continue;
|
href,
|
||||||
}
|
pageDir,
|
||||||
|
attachmentCandidates,
|
||||||
|
);
|
||||||
|
if (!resolvedHref) continue;
|
||||||
|
|
||||||
// Skip if the file doesn't exist
|
// Check if already processed (was referenced in HTML).
|
||||||
if (!attachmentCandidates.has(href)) {
|
// Inline elements may have been processed under an alias key (original
|
||||||
|
// filename) rather than the numeric archive path, so also check whether
|
||||||
|
// the underlying absolute file path has already been uploaded.
|
||||||
|
const absPath = attachmentCandidates.get(resolvedHref);
|
||||||
|
const alreadyProcessed =
|
||||||
|
processed.has(resolvedHref) ||
|
||||||
|
(absPath &&
|
||||||
|
Array.from(processed.values()).some(
|
||||||
|
(entry) => entry.abs === absPath,
|
||||||
|
));
|
||||||
|
if (alreadyProcessed) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// This attachment was in the list but not referenced in HTML - add it
|
// This attachment was in the list but not referenced in HTML - add it
|
||||||
const { attachmentId, apiFilePath, abs } = processFile(href);
|
const { attachmentId, apiFilePath, abs } = processFile(resolvedHref);
|
||||||
const mime = mimeType || getMimeType(abs);
|
const mime = mimeType || getMimeType(abs);
|
||||||
|
|
||||||
// Add as attachment node at the end
|
// Add as attachment node at the end
|
||||||
|
|||||||
@@ -0,0 +1,35 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { ThrottlerModule } from '@nestjs/throttler';
|
||||||
|
import { ThrottlerStorageRedisService } from '@nest-lab/throttler-storage-redis';
|
||||||
|
import { EnvironmentService } from '../environment/environment.service';
|
||||||
|
import { EnvironmentModule } from '../environment/environment.module';
|
||||||
|
import { parseRedisUrl } from '../../common/helpers';
|
||||||
|
import Redis from 'ioredis';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [
|
||||||
|
ThrottlerModule.forRootAsync({
|
||||||
|
imports: [EnvironmentModule],
|
||||||
|
useFactory: (environmentService: EnvironmentService) => {
|
||||||
|
const redisConfig = parseRedisUrl(environmentService.getRedisUrl());
|
||||||
|
|
||||||
|
return {
|
||||||
|
throttlers: [{ name: 'auth', ttl: 60_000, limit: 10 }],
|
||||||
|
errorMessage: 'Too many requests',
|
||||||
|
storage: new ThrottlerStorageRedisService(
|
||||||
|
new Redis({
|
||||||
|
host: redisConfig.host,
|
||||||
|
port: redisConfig.port,
|
||||||
|
password: redisConfig.password,
|
||||||
|
db: redisConfig.db,
|
||||||
|
family: redisConfig.family,
|
||||||
|
keyPrefix: 'throttle:',
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
};
|
||||||
|
},
|
||||||
|
inject: [EnvironmentService],
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
})
|
||||||
|
export class ThrottleModule {}
|
||||||
@@ -10,6 +10,7 @@ import { TransformHttpResponseInterceptor } from './common/interceptors/http-res
|
|||||||
import { WsRedisIoAdapter } from './ws/adapter/ws-redis.adapter';
|
import { WsRedisIoAdapter } from './ws/adapter/ws-redis.adapter';
|
||||||
import fastifyMultipart from '@fastify/multipart';
|
import fastifyMultipart from '@fastify/multipart';
|
||||||
import fastifyCookie from '@fastify/cookie';
|
import fastifyCookie from '@fastify/cookie';
|
||||||
|
import fastifyIp from 'fastify-ip';
|
||||||
import { InternalLogFilter } from './common/logger/internal-log-filter';
|
import { InternalLogFilter } from './common/logger/internal-log-filter';
|
||||||
|
|
||||||
async function bootstrap() {
|
async function bootstrap() {
|
||||||
@@ -45,6 +46,7 @@ async function bootstrap() {
|
|||||||
|
|
||||||
app.useWebSocketAdapter(redisIoAdapter);
|
app.useWebSocketAdapter(redisIoAdapter);
|
||||||
|
|
||||||
|
await app.register(fastifyIp);
|
||||||
await app.register(fastifyMultipart);
|
await app.register(fastifyMultipart);
|
||||||
await app.register(fastifyCookie);
|
await app.register(fastifyCookie);
|
||||||
|
|
||||||
|
|||||||
Generated
+48
@@ -493,6 +493,9 @@ importers:
|
|||||||
'@modelcontextprotocol/sdk':
|
'@modelcontextprotocol/sdk':
|
||||||
specifier: ^1.27.1
|
specifier: ^1.27.1
|
||||||
version: 1.27.1(@cfworker/json-schema@4.1.1)(zod@4.3.6)
|
version: 1.27.1(@cfworker/json-schema@4.1.1)(zod@4.3.6)
|
||||||
|
'@nest-lab/throttler-storage-redis':
|
||||||
|
specifier: ^1.2.0
|
||||||
|
version: 1.2.0(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.17)(@nestjs/throttler@6.5.0(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.17)(reflect-metadata@0.2.2))(ioredis@5.10.1)(reflect-metadata@0.2.2)
|
||||||
'@nestjs-labs/nestjs-ioredis':
|
'@nestjs-labs/nestjs-ioredis':
|
||||||
specifier: ^11.0.4
|
specifier: ^11.0.4
|
||||||
version: 11.0.4(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.17)(ioredis@5.10.1)
|
version: 11.0.4(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.17)(ioredis@5.10.1)
|
||||||
@@ -535,6 +538,9 @@ importers:
|
|||||||
'@nestjs/terminus':
|
'@nestjs/terminus':
|
||||||
specifier: ^11.1.1
|
specifier: ^11.1.1
|
||||||
version: 11.1.1(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.17)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
version: 11.1.1(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.17)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
|
'@nestjs/throttler':
|
||||||
|
specifier: ^6.5.0
|
||||||
|
version: 6.5.0(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.17)(reflect-metadata@0.2.2)
|
||||||
'@nestjs/websockets':
|
'@nestjs/websockets':
|
||||||
specifier: ^11.1.17
|
specifier: ^11.1.17
|
||||||
version: 11.1.17(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.17)(@nestjs/platform-socket.io@11.1.17)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
version: 11.1.17(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.17)(@nestjs/platform-socket.io@11.1.17)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
@@ -580,6 +586,9 @@ importers:
|
|||||||
cookie:
|
cookie:
|
||||||
specifier: ^1.1.1
|
specifier: ^1.1.1
|
||||||
version: 1.1.1
|
version: 1.1.1
|
||||||
|
fastify-ip:
|
||||||
|
specifier: ^2.0.0
|
||||||
|
version: 2.0.0
|
||||||
fs-extra:
|
fs-extra:
|
||||||
specifier: ^11.3.4
|
specifier: ^11.3.4
|
||||||
version: 11.3.4
|
version: 11.3.4
|
||||||
@@ -2925,6 +2934,15 @@ packages:
|
|||||||
'@napi-rs/wasm-runtime@1.1.1':
|
'@napi-rs/wasm-runtime@1.1.1':
|
||||||
resolution: {integrity: sha512-p64ah1M1ld8xjWv3qbvFwHiFVWrq1yFvV4f7w+mzaqiR4IlSgkqhcRdHwsGgomwzBH51sRY4NEowLxnaBjcW/A==}
|
resolution: {integrity: sha512-p64ah1M1ld8xjWv3qbvFwHiFVWrq1yFvV4f7w+mzaqiR4IlSgkqhcRdHwsGgomwzBH51sRY4NEowLxnaBjcW/A==}
|
||||||
|
|
||||||
|
'@nest-lab/throttler-storage-redis@1.2.0':
|
||||||
|
resolution: {integrity: sha512-tMkUyo68NCKTR+zILk+EC35SMYBtDPZY2mCj7ZaCietWGVTnuP4zwq9ERYfvU6kJv6h8teNZrC6MJCmY6/dljw==}
|
||||||
|
peerDependencies:
|
||||||
|
'@nestjs/common': ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0
|
||||||
|
'@nestjs/core': ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0
|
||||||
|
'@nestjs/throttler': '>=6.0.0'
|
||||||
|
ioredis: '>=5.0.0'
|
||||||
|
reflect-metadata: ^0.2.1
|
||||||
|
|
||||||
'@nestjs-labs/nestjs-ioredis@11.0.4':
|
'@nestjs-labs/nestjs-ioredis@11.0.4':
|
||||||
resolution: {integrity: sha512-4jPNOrxDiwNMIN5OLmsMWhA782kxv/ZBxkySX9l8n6sr55acHX/BciaFsOXVa/ILsm+Y7893y98/6WNhmEoiNQ==}
|
resolution: {integrity: sha512-4jPNOrxDiwNMIN5OLmsMWhA782kxv/ZBxkySX9l8n6sr55acHX/BciaFsOXVa/ILsm+Y7893y98/6WNhmEoiNQ==}
|
||||||
engines: {node: '>=16'}
|
engines: {node: '>=16'}
|
||||||
@@ -3127,6 +3145,13 @@ packages:
|
|||||||
'@nestjs/platform-express':
|
'@nestjs/platform-express':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
|
'@nestjs/throttler@6.5.0':
|
||||||
|
resolution: {integrity: sha512-9j0ZRfH0QE1qyrj9JjIRDz5gQLPqq9yVC2nHsrosDVAfI5HHw08/aUAWx9DZLSdQf4HDkmhTTEGLrRFHENvchQ==}
|
||||||
|
peerDependencies:
|
||||||
|
'@nestjs/common': ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0
|
||||||
|
'@nestjs/core': ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0
|
||||||
|
reflect-metadata: ^0.1.13 || ^0.2.0
|
||||||
|
|
||||||
'@nestjs/websockets@11.1.17':
|
'@nestjs/websockets@11.1.17':
|
||||||
resolution: {integrity: sha512-YbwQ0QfVj0lxkKQhdIIgk14ZSVWDqGk1J8nNSN6SLjf36sVv58Ma5ro+dtQua8wj3l2Ub7JJCVFixEhKtYc/rQ==}
|
resolution: {integrity: sha512-YbwQ0QfVj0lxkKQhdIIgk14ZSVWDqGk1J8nNSN6SLjf36sVv58Ma5ro+dtQua8wj3l2Ub7JJCVFixEhKtYc/rQ==}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
@@ -7016,6 +7041,10 @@ packages:
|
|||||||
resolution: {integrity: sha512-Z7Fh2nVQSb2d+poDViM063ix2ZGt9jmY1nWhPfHBOK2Hgnb/OW3P4Et3P/81SEej0J7QbWtJqxO05h8QYfK7LQ==}
|
resolution: {integrity: sha512-Z7Fh2nVQSb2d+poDViM063ix2ZGt9jmY1nWhPfHBOK2Hgnb/OW3P4Et3P/81SEej0J7QbWtJqxO05h8QYfK7LQ==}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
|
fastify-ip@2.0.0:
|
||||||
|
resolution: {integrity: sha512-7mQyAc7sapawpiriEFoJyQIs41nNIO42UCzgMKrjNGsIegnevj2VhOlXLLTa+q7cxXfJ5fDGmOAdQpaIgA9ObA==}
|
||||||
|
engines: {node: '>=20.x'}
|
||||||
|
|
||||||
fastify-plugin@5.0.1:
|
fastify-plugin@5.0.1:
|
||||||
resolution: {integrity: sha512-HCxs+YnRaWzCl+cWRYFnHmeRFyR5GVnJTAaCJQiYzQSDwK9MgJdyAsuL3nh0EWRCYMgQ5MeziymvmAhUHYHDUQ==}
|
resolution: {integrity: sha512-HCxs+YnRaWzCl+cWRYFnHmeRFyR5GVnJTAaCJQiYzQSDwK9MgJdyAsuL3nh0EWRCYMgQ5MeziymvmAhUHYHDUQ==}
|
||||||
|
|
||||||
@@ -13463,6 +13492,15 @@ snapshots:
|
|||||||
'@tybys/wasm-util': 0.10.1
|
'@tybys/wasm-util': 0.10.1
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
|
'@nest-lab/throttler-storage-redis@1.2.0(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.17)(@nestjs/throttler@6.5.0(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.17)(reflect-metadata@0.2.2))(ioredis@5.10.1)(reflect-metadata@0.2.2)':
|
||||||
|
dependencies:
|
||||||
|
'@nestjs/common': 11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
|
'@nestjs/core': 11.1.17(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/websockets@11.1.17)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
|
'@nestjs/throttler': 6.5.0(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.17)(reflect-metadata@0.2.2)
|
||||||
|
ioredis: 5.10.1
|
||||||
|
reflect-metadata: 0.2.2
|
||||||
|
tslib: 2.8.1
|
||||||
|
|
||||||
'@nestjs-labs/nestjs-ioredis@11.0.4(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.17)(ioredis@5.10.1)':
|
'@nestjs-labs/nestjs-ioredis@11.0.4(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.17)(ioredis@5.10.1)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@nestjs/common': 11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/common': 11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
@@ -13643,6 +13681,12 @@ snapshots:
|
|||||||
'@nestjs/core': 11.1.17(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/websockets@11.1.17)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/core': 11.1.17(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/websockets@11.1.17)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
tslib: 2.8.1
|
tslib: 2.8.1
|
||||||
|
|
||||||
|
'@nestjs/throttler@6.5.0(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.17)(reflect-metadata@0.2.2)':
|
||||||
|
dependencies:
|
||||||
|
'@nestjs/common': 11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
|
'@nestjs/core': 11.1.17(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/websockets@11.1.17)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
|
reflect-metadata: 0.2.2
|
||||||
|
|
||||||
'@nestjs/websockets@11.1.17(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.17)(@nestjs/platform-socket.io@11.1.17)(reflect-metadata@0.2.2)(rxjs@7.8.2)':
|
'@nestjs/websockets@11.1.17(@nestjs/common@11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.17)(@nestjs/platform-socket.io@11.1.17)(reflect-metadata@0.2.2)(rxjs@7.8.2)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@nestjs/common': 11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/common': 11.1.17(class-transformer@0.5.1)(class-validator@0.15.1)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
@@ -18072,6 +18116,10 @@ snapshots:
|
|||||||
path-expression-matcher: 1.2.0
|
path-expression-matcher: 1.2.0
|
||||||
strnum: 2.2.1
|
strnum: 2.2.1
|
||||||
|
|
||||||
|
fastify-ip@2.0.0:
|
||||||
|
dependencies:
|
||||||
|
fastify-plugin: 5.1.0
|
||||||
|
|
||||||
fastify-plugin@5.0.1: {}
|
fastify-plugin@5.0.1: {}
|
||||||
|
|
||||||
fastify-plugin@5.1.0: {}
|
fastify-plugin@5.1.0: {}
|
||||||
|
|||||||
Reference in New Issue
Block a user