mirror of
https://github.com/docmost/docmost.git
synced 2026-08-25 15:57:11 +08:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
239df2b3a4 |
@@ -52,7 +52,7 @@
|
|||||||
"mantine-form-zod-resolver": "1.3.0",
|
"mantine-form-zod-resolver": "1.3.0",
|
||||||
"mermaid": "11.16.1",
|
"mermaid": "11.16.1",
|
||||||
"mitt": "3.0.1",
|
"mitt": "3.0.1",
|
||||||
"nanoid": "3.3.18",
|
"nanoid": "3.3.17",
|
||||||
"posthog-js": "1.391.2",
|
"posthog-js": "1.391.2",
|
||||||
"react": "19.2.7",
|
"react": "19.2.7",
|
||||||
"react-clear-modal": "^2.0.18",
|
"react-clear-modal": "^2.0.18",
|
||||||
|
|||||||
@@ -15,14 +15,6 @@ export interface IAiSearchResponse {
|
|||||||
}>;
|
}>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function hintVectorCache(): Promise<void> {
|
|
||||||
try {
|
|
||||||
await api.post("/ai/vector-cache-hint");
|
|
||||||
} catch {
|
|
||||||
// best-effort cache hint
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function aiAnswers(
|
export async function aiAnswers(
|
||||||
params: IPageSearchParams,
|
params: IPageSearchParams,
|
||||||
onChunk?: (chunk: { content?: string; sources?: any[] }) => void,
|
onChunk?: (chunk: { content?: string; sources?: any[] }) => void,
|
||||||
|
|||||||
@@ -13,16 +13,11 @@ import { SearchResultItem } from "./search-result-item.tsx";
|
|||||||
import { AiSearchResult } from "../../../ee/ai/components/ai-search-result.tsx";
|
import { AiSearchResult } from "../../../ee/ai/components/ai-search-result.tsx";
|
||||||
import { useHasFeature } from "@/ee/hooks/use-feature";
|
import { useHasFeature } from "@/ee/hooks/use-feature";
|
||||||
import { Feature } from "@/ee/features";
|
import { Feature } from "@/ee/features";
|
||||||
import { useAtomValue } from "jotai";
|
|
||||||
import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
|
|
||||||
import { hintVectorCache } from "@/ee/ai/services/ai-search-service.ts";
|
|
||||||
import { getAiVectorDriver } from "@/lib/config.ts";
|
|
||||||
|
|
||||||
interface SearchSpotlightProps {
|
interface SearchSpotlightProps {
|
||||||
spaceId?: string;
|
spaceId?: string;
|
||||||
}
|
}
|
||||||
export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
|
export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
|
||||||
const workspace = useAtomValue(workspaceAtom);
|
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const hasAiFeature = useHasFeature(Feature.AI);
|
const hasAiFeature = useHasFeature(Feature.AI);
|
||||||
const hasAttachmentIndexing = useHasFeature(Feature.ATTACHMENT_INDEXING);
|
const hasAttachmentIndexing = useHasFeature(Feature.ATTACHMENT_INDEXING);
|
||||||
@@ -101,15 +96,6 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
|
|||||||
/>
|
/>
|
||||||
));
|
));
|
||||||
|
|
||||||
const handleSpotlightOpen = () => {
|
|
||||||
if (
|
|
||||||
workspace?.settings?.ai?.search === true &&
|
|
||||||
getAiVectorDriver() === "turbopuffer"
|
|
||||||
) {
|
|
||||||
hintVectorCache();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleFiltersChange = (newFilters: any) => {
|
const handleFiltersChange = (newFilters: any) => {
|
||||||
setFilters(newFilters);
|
setFilters(newFilters);
|
||||||
};
|
};
|
||||||
@@ -129,7 +115,6 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
|
|||||||
<Spotlight.Root
|
<Spotlight.Root
|
||||||
size="xl"
|
size="xl"
|
||||||
maxHeight={600}
|
maxHeight={600}
|
||||||
onSpotlightOpen={handleSpotlightOpen}
|
|
||||||
store={searchSpotlightStore}
|
store={searchSpotlightStore}
|
||||||
query={query}
|
query={query}
|
||||||
onQueryChange={setQuery}
|
onQueryChange={setQuery}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { useEffect, useRef, useState } from "react";
|
import React, { useEffect, useState } from "react";
|
||||||
import { useDebouncedValue } from "@mantine/hooks";
|
import { useDebouncedValue } from "@mantine/hooks";
|
||||||
import { Group, Select, SelectProps, Text } from "@mantine/core";
|
import { Group, Select, SelectProps, Text } from "@mantine/core";
|
||||||
import { useGetSpacesQuery } from "@/features/space/queries/space-query.ts";
|
import { useGetSpacesQuery } from "@/features/space/queries/space-query.ts";
|
||||||
@@ -14,7 +14,6 @@ interface SpaceSelectProps {
|
|||||||
width?: number;
|
width?: number;
|
||||||
opened?: boolean;
|
opened?: boolean;
|
||||||
clearable?: boolean;
|
clearable?: boolean;
|
||||||
withinPortal?: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const renderSelectOption: SelectProps["renderOption"] = ({ option }) => (
|
const renderSelectOption: SelectProps["renderOption"] = ({ option }) => (
|
||||||
@@ -42,7 +41,6 @@ export function SpaceSelect({
|
|||||||
width,
|
width,
|
||||||
opened,
|
opened,
|
||||||
clearable,
|
clearable,
|
||||||
withinPortal = true,
|
|
||||||
}: SpaceSelectProps) {
|
}: SpaceSelectProps) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const [searchValue, setSearchValue] = useState("");
|
const [searchValue, setSearchValue] = useState("");
|
||||||
@@ -52,13 +50,9 @@ export function SpaceSelect({
|
|||||||
limit: 50,
|
limit: 50,
|
||||||
});
|
});
|
||||||
const [data, setData] = useState([]);
|
const [data, setData] = useState([]);
|
||||||
const fetchedSpaces = useRef(new Map<string, ISpace>());
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (spaces) {
|
if (spaces) {
|
||||||
spaces.items.forEach((space: ISpace) =>
|
|
||||||
fetchedSpaces.current.set(space.slug, space),
|
|
||||||
);
|
|
||||||
const spaceData = spaces?.items
|
const spaceData = spaces?.items
|
||||||
.filter((space: ISpace) => space.slug !== value)
|
.filter((space: ISpace) => space.slug !== value)
|
||||||
.map((space: ISpace) => {
|
.map((space: ISpace) => {
|
||||||
@@ -89,19 +83,14 @@ export function SpaceSelect({
|
|||||||
onSearchChange={setSearchValue}
|
onSearchChange={setSearchValue}
|
||||||
clearable={clearable}
|
clearable={clearable}
|
||||||
variant="filled"
|
variant="filled"
|
||||||
onChange={(slug) => {
|
onChange={(slug) =>
|
||||||
// options accumulate across fetches; resolve against everything
|
onChange(spaces.items?.find((item) => item.slug === slug))
|
||||||
// fetched, not just the latest query result
|
}
|
||||||
const space = slug && fetchedSpaces.current.get(slug);
|
|
||||||
if (space) {
|
|
||||||
onChange(space);
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
onClick={(e) => e.stopPropagation()}
|
onClick={(e) => e.stopPropagation()}
|
||||||
nothingFoundMessage={t("No space found")}
|
nothingFoundMessage={t("No space found")}
|
||||||
limit={50}
|
limit={50}
|
||||||
checkIconPosition="right"
|
checkIconPosition="right"
|
||||||
comboboxProps={{ width, withinPortal, position: "bottom", keepMounted: false, dropdownPadding: 0 }}
|
comboboxProps={{ width, withinPortal: true, position: "bottom", keepMounted: false, dropdownPadding: 0 }}
|
||||||
dropdownOpened={opened}
|
dropdownOpened={opened}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -70,7 +70,6 @@ export function SwitchSpace({
|
|||||||
onChange={(space) => handleSelect(space.slug)}
|
onChange={(space) => handleSelect(space.slug)}
|
||||||
width={300}
|
width={300}
|
||||||
opened={true}
|
opened={true}
|
||||||
withinPortal={false}
|
|
||||||
/>
|
/>
|
||||||
</Popover.Dropdown>
|
</Popover.Dropdown>
|
||||||
</Popover>
|
</Popover>
|
||||||
|
|||||||
@@ -43,10 +43,6 @@ export function isCloud(): boolean {
|
|||||||
return castToBoolean(getConfigValue("CLOUD"));
|
return castToBoolean(getConfigValue("CLOUD"));
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getAiVectorDriver(): string {
|
|
||||||
return getConfigValue("AI_VECTOR_DRIVER");
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getAvatarUrl(
|
export function getAvatarUrl(
|
||||||
avatarUrl: string,
|
avatarUrl: string,
|
||||||
type: AvatarIconType = AvatarIconType.AVATAR,
|
type: AvatarIconType = AvatarIconType.AVATAR,
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ export default defineConfig(({ mode }) => {
|
|||||||
BILLING_TRIAL_DAYS,
|
BILLING_TRIAL_DAYS,
|
||||||
POSTHOG_HOST,
|
POSTHOG_HOST,
|
||||||
POSTHOG_KEY,
|
POSTHOG_KEY,
|
||||||
AI_VECTOR_DRIVER,
|
|
||||||
} = loadEnv(mode, envPath, "");
|
} = loadEnv(mode, envPath, "");
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -32,7 +31,6 @@ export default defineConfig(({ mode }) => {
|
|||||||
BILLING_TRIAL_DAYS,
|
BILLING_TRIAL_DAYS,
|
||||||
POSTHOG_HOST,
|
POSTHOG_HOST,
|
||||||
POSTHOG_KEY,
|
POSTHOG_KEY,
|
||||||
AI_VECTOR_DRIVER,
|
|
||||||
},
|
},
|
||||||
APP_VERSION: JSON.stringify(process.env.npm_package_version),
|
APP_VERSION: JSON.stringify(process.env.npm_package_version),
|
||||||
},
|
},
|
||||||
|
|||||||
+10
-11
@@ -40,33 +40,32 @@
|
|||||||
"@clickhouse/client": "1.18.2",
|
"@clickhouse/client": "1.18.2",
|
||||||
"@docmost/base-formula": "workspace:*",
|
"@docmost/base-formula": "workspace:*",
|
||||||
"@docmost/pdf-inspector": "1.9.6",
|
"@docmost/pdf-inspector": "1.9.6",
|
||||||
"@fastify/cookie": "11.1.2",
|
"@fastify/cookie": "11.0.2",
|
||||||
"@fastify/multipart": "10.1.1",
|
"@fastify/multipart": "10.0.0",
|
||||||
"@fastify/static": "10.1.3",
|
"@fastify/static": "10.1.2",
|
||||||
"@keyv/redis": "5.1.6",
|
"@keyv/redis": "5.1.6",
|
||||||
"@langchain/core": "1.1.46",
|
"@langchain/core": "1.1.46",
|
||||||
"@langchain/textsplitters": "1.0.1",
|
"@langchain/textsplitters": "1.0.1",
|
||||||
"@modelcontextprotocol/sdk": "1.30.0",
|
"@modelcontextprotocol/sdk": "1.30.0",
|
||||||
"@nest-lab/throttler-storage-redis": "1.2.0",
|
"@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.5",
|
"@nestjs/bullmq": "11.0.4",
|
||||||
"@nestjs/cache-manager": "3.1.3",
|
"@nestjs/cache-manager": "3.1.3",
|
||||||
"@nestjs/common": "11.2.1",
|
"@nestjs/common": "11.1.28",
|
||||||
"@nestjs/config": "4.0.4",
|
"@nestjs/config": "4.0.4",
|
||||||
"@nestjs/core": "11.2.1",
|
"@nestjs/core": "11.1.27",
|
||||||
"@nestjs/event-emitter": "3.1.0",
|
"@nestjs/event-emitter": "3.1.0",
|
||||||
"@nestjs/jwt": "11.0.2",
|
"@nestjs/jwt": "11.0.2",
|
||||||
"@nestjs/mapped-types": "2.1.1",
|
"@nestjs/mapped-types": "2.1.1",
|
||||||
"@nestjs/passport": "11.0.5",
|
"@nestjs/passport": "11.0.5",
|
||||||
"@nestjs/platform-fastify": "11.2.1",
|
"@nestjs/platform-fastify": "11.1.28",
|
||||||
"@nestjs/platform-socket.io": "11.2.1",
|
"@nestjs/platform-socket.io": "11.1.28",
|
||||||
"@nestjs/schedule": "6.1.3",
|
"@nestjs/schedule": "6.1.3",
|
||||||
"@nestjs/terminus": "11.1.1",
|
"@nestjs/terminus": "11.1.1",
|
||||||
"@nestjs/throttler": "6.5.0",
|
"@nestjs/throttler": "6.5.0",
|
||||||
"@nestjs/websockets": "11.2.1",
|
"@nestjs/websockets": "11.1.28",
|
||||||
"@node-saml/passport-saml": "5.1.0",
|
"@node-saml/passport-saml": "5.1.0",
|
||||||
"@socket.io/redis-adapter": "8.3.0",
|
"@socket.io/redis-adapter": "8.3.0",
|
||||||
"@turbopuffer/turbopuffer": "^2.8.0",
|
|
||||||
"ai": "6.0.134",
|
"ai": "6.0.134",
|
||||||
"ai-sdk-ollama": "3.8.1",
|
"ai-sdk-ollama": "3.8.1",
|
||||||
"bcrypt": "6.0.0",
|
"bcrypt": "6.0.0",
|
||||||
@@ -120,7 +119,7 @@
|
|||||||
"tmp-promise": "3.0.3",
|
"tmp-promise": "3.0.3",
|
||||||
"typesense": "3.0.5",
|
"typesense": "3.0.5",
|
||||||
"undici": "7.29.0",
|
"undici": "7.29.0",
|
||||||
"ws": "8.21.3",
|
"ws": "8.21.0",
|
||||||
"yauzl": "3.4.0",
|
"yauzl": "3.4.0",
|
||||||
"zod": "4.3.6"
|
"zod": "4.3.6"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -22,13 +22,11 @@ import { TelemetryModule } from './integrations/telemetry/telemetry.module';
|
|||||||
import { RedisModule } from '@nestjs-labs/nestjs-ioredis';
|
import { RedisModule } from '@nestjs-labs/nestjs-ioredis';
|
||||||
import { RedisConfigService } from './integrations/redis/redis-config.service';
|
import { RedisConfigService } from './integrations/redis/redis-config.service';
|
||||||
import { CacheModule } from '@nestjs/cache-manager';
|
import { CacheModule } from '@nestjs/cache-manager';
|
||||||
import KeyvRedis, { defaultReconnectStrategy } from '@keyv/redis';
|
import KeyvRedis from '@keyv/redis';
|
||||||
import { parseRedisUrl } from './common/helpers';
|
|
||||||
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';
|
import { ThrottleModule } from './integrations/throttle/throttle.module';
|
||||||
import { EncryptionModule } from './integrations/encryption/encryption.module';
|
|
||||||
|
|
||||||
const enterpriseModules = [];
|
const enterpriseModules = [];
|
||||||
try {
|
try {
|
||||||
@@ -55,7 +53,6 @@ try {
|
|||||||
CoreModule,
|
CoreModule,
|
||||||
DatabaseModule,
|
DatabaseModule,
|
||||||
EnvironmentModule,
|
EnvironmentModule,
|
||||||
EncryptionModule,
|
|
||||||
RedisModule.forRootAsync({
|
RedisModule.forRootAsync({
|
||||||
useClass: RedisConfigService,
|
useClass: RedisConfigService,
|
||||||
}),
|
}),
|
||||||
@@ -63,20 +60,10 @@ try {
|
|||||||
isGlobal: true,
|
isGlobal: true,
|
||||||
useFactory: async (environmentService: EnvironmentService) => {
|
useFactory: async (environmentService: EnvironmentService) => {
|
||||||
const redisUrl = environmentService.getRedisUrl();
|
const redisUrl = environmentService.getRedisUrl();
|
||||||
const { family, tls } = parseRedisUrl(redisUrl);
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
ttl: 5 * 1000,
|
ttl: 5 * 1000,
|
||||||
stores: [
|
stores: [new KeyvRedis(redisUrl)],
|
||||||
new KeyvRedis({
|
|
||||||
url: redisUrl,
|
|
||||||
socket: {
|
|
||||||
family,
|
|
||||||
reconnectStrategy: defaultReconnectStrategy,
|
|
||||||
...tls,
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
],
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
inject: [EnvironmentService],
|
inject: [EnvironmentService],
|
||||||
|
|||||||
@@ -66,7 +66,6 @@ export class CollaborationGateway {
|
|||||||
password: this.redisConfig.password,
|
password: this.redisConfig.password,
|
||||||
db: this.redisConfig.db,
|
db: this.redisConfig.db,
|
||||||
family: this.redisConfig.family,
|
family: this.redisConfig.family,
|
||||||
tls: this.redisConfig.tls,
|
|
||||||
retryStrategy: createRetryStrategy(),
|
retryStrategy: createRetryStrategy(),
|
||||||
}),
|
}),
|
||||||
serverId: `collab-${os?.hostname()}-${nanoid(10)}`,
|
serverId: `collab-${os?.hostname()}-${nanoid(10)}`,
|
||||||
|
|||||||
@@ -57,7 +57,6 @@ import {
|
|||||||
JSONContent,
|
JSONContent,
|
||||||
} from '@tiptap/core';
|
} from '@tiptap/core';
|
||||||
import { generateHTML, generateJSON } from '../common/helpers/prosemirror/html';
|
import { generateHTML, generateJSON } from '../common/helpers/prosemirror/html';
|
||||||
import { collapseBlankLines } from '../common/helpers';
|
|
||||||
// @tiptap/html library works best for generating prosemirror json state but not HTML
|
// @tiptap/html library works best for generating prosemirror json state but not HTML
|
||||||
// see: https://github.com/ueberdosis/tiptap/issues/5352
|
// see: https://github.com/ueberdosis/tiptap/issues/5352
|
||||||
// see:https://github.com/ueberdosis/tiptap/issues/4089
|
// see:https://github.com/ueberdosis/tiptap/issues/4089
|
||||||
@@ -147,7 +146,7 @@ export function htmlToJson(html: string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function jsonToText(tiptapJson: JSONContent) {
|
export function jsonToText(tiptapJson: JSONContent) {
|
||||||
return collapseBlankLines(generateText(tiptapJson, tiptapExtensions));
|
return generateText(tiptapJson, tiptapExtensions);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function jsonToNode(tiptapJson: JSONContent) {
|
export function jsonToNode(tiptapJson: JSONContent) {
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
export * from './utils';
|
export * from './utils';
|
||||||
export * from './text.utils';
|
|
||||||
export * from './nanoid.utils';
|
export * from './nanoid.utils';
|
||||||
export * from './file.helper';
|
export * from './file.helper';
|
||||||
export * from './constants';
|
export * from './constants';
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
import { collapseBlankLines } from './text.utils';
|
|
||||||
|
|
||||||
describe('collapseBlankLines', () => {
|
|
||||||
it.each([
|
|
||||||
['a\n\n\n\nb', 'a\n\nb'],
|
|
||||||
['a\n\nb', 'a\n\nb'],
|
|
||||||
['a\nb', 'a\nb'],
|
|
||||||
['\n\n\n\na\n\n\n', '\n\na\n\n'],
|
|
||||||
['no newlines', 'no newlines'],
|
|
||||||
['', ''],
|
|
||||||
])('collapses %j to %j', (input, expected) => {
|
|
||||||
expect(collapseBlankLines(input)).toBe(expected);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
export function collapseBlankLines(text: string): string {
|
|
||||||
return text.replace(/\n{2,}/g, '\n\n');
|
|
||||||
}
|
|
||||||
@@ -30,14 +30,13 @@ export type RedisConfig = {
|
|||||||
db: number;
|
db: number;
|
||||||
password?: string;
|
password?: string;
|
||||||
family?: number;
|
family?: number;
|
||||||
tls?: { rejectUnauthorized?: boolean };
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export function parseRedisUrl(redisUrl: string): RedisConfig {
|
export function parseRedisUrl(redisUrl: string): RedisConfig {
|
||||||
// format - redis[s]://[[username][:password]@][host][:port][/db-number][?family=4|6][&rejectUnauthorized=false]
|
// format - redis[s]://[[username][:password]@][host][:port][/db-number][?family=4|6]
|
||||||
const url = new URL(redisUrl);
|
const url = new URL(redisUrl);
|
||||||
const { hostname, port, password, pathname, protocol, searchParams } = url;
|
const { hostname, port, password, pathname, searchParams } = url;
|
||||||
const portInt = port ? parseInt(port, 10) : 6379;
|
const portInt = parseInt(port, 10);
|
||||||
|
|
||||||
let db: number = 0;
|
let db: number = 0;
|
||||||
// extract db value if present
|
// extract db value if present
|
||||||
@@ -55,14 +54,7 @@ export function parseRedisUrl(redisUrl: string): RedisConfig {
|
|||||||
family = parseInt(familyParam, 10);
|
family = parseInt(familyParam, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
const tls =
|
return { host: hostname, port: portInt, password, db, family };
|
||||||
protocol === 'rediss:'
|
|
||||||
? searchParams.get('rejectUnauthorized') === 'false'
|
|
||||||
? { rejectUnauthorized: false }
|
|
||||||
: {}
|
|
||||||
: undefined;
|
|
||||||
|
|
||||||
return { host: hostname, port: portInt, password: password || undefined, db, family, tls };
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function createRetryStrategy() {
|
export function createRetryStrategy() {
|
||||||
|
|||||||
@@ -496,21 +496,10 @@ export class PageService {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
await this.aiQueue.add(
|
await this.aiQueue.add(QueueJob.PAGE_MOVED_TO_SPACE, {
|
||||||
QueueJob.PAGE_MOVED_TO_SPACE,
|
pageIds: pageIdsToMove,
|
||||||
{
|
workspaceId: rootPage.workspaceId,
|
||||||
pageIds: pageIdsToMove,
|
});
|
||||||
spaceId,
|
|
||||||
workspaceId: rootPage.workspaceId,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
attempts: 2,
|
|
||||||
backoff: {
|
|
||||||
type: 'fixed',
|
|
||||||
delay: 2 * 60 * 1000,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -339,25 +339,15 @@ export class SpaceMemberService {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
await executeTx(this.db, async (trx) => {
|
if (spaceMember.role === SpaceRole.ADMIN) {
|
||||||
await trx
|
await this.validateLastAdmin(dto.spaceId);
|
||||||
.selectFrom('spaces')
|
}
|
||||||
.select('id')
|
|
||||||
.where('id', '=', dto.spaceId)
|
|
||||||
.forUpdate()
|
|
||||||
.executeTakeFirst();
|
|
||||||
|
|
||||||
if (spaceMember.role === SpaceRole.ADMIN) {
|
await this.spaceMemberRepo.updateSpaceMember(
|
||||||
await this.validateLastAdmin(dto.spaceId, trx);
|
{ role: dto.role },
|
||||||
}
|
spaceMember.id,
|
||||||
|
dto.spaceId,
|
||||||
await this.spaceMemberRepo.updateSpaceMember(
|
);
|
||||||
{ role: dto.role },
|
|
||||||
spaceMember.id,
|
|
||||||
dto.spaceId,
|
|
||||||
trx,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
this.auditService.log({
|
this.auditService.log({
|
||||||
event: AuditEvent.SPACE_MEMBER_ROLE_CHANGED,
|
event: AuditEvent.SPACE_MEMBER_ROLE_CHANGED,
|
||||||
@@ -378,14 +368,10 @@ export class SpaceMemberService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async validateLastAdmin(
|
async validateLastAdmin(spaceId: string): Promise<void> {
|
||||||
spaceId: string,
|
|
||||||
trx?: KyselyTransaction,
|
|
||||||
): Promise<void> {
|
|
||||||
const spaceOwnerCount = await this.spaceMemberRepo.roleCountBySpaceId(
|
const spaceOwnerCount = await this.spaceMemberRepo.roleCountBySpaceId(
|
||||||
SpaceRole.ADMIN,
|
SpaceRole.ADMIN,
|
||||||
spaceId,
|
spaceId,
|
||||||
trx,
|
|
||||||
);
|
);
|
||||||
if (spaceOwnerCount === 1) {
|
if (spaceOwnerCount === 1) {
|
||||||
throw new BadRequestException(
|
throw new BadRequestException(
|
||||||
|
|||||||
@@ -396,10 +396,7 @@ export class WorkspaceService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (
|
if (updateWorkspaceDto.aiSearch) {
|
||||||
updateWorkspaceDto.aiSearch &&
|
|
||||||
this.environmentService.getAiVectorDriver() !== 'turbopuffer'
|
|
||||||
) {
|
|
||||||
const tableExists = await isPageEmbeddingsTableExists(this.db);
|
const tableExists = await isPageEmbeddingsTableExists(this.db);
|
||||||
if (!tableExists) {
|
if (!tableExists) {
|
||||||
throw new BadRequestException(
|
throw new BadRequestException(
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import { EnvironmentService } from '../../integrations/environment/environment.s
|
|||||||
|
|
||||||
export class SpaceEvent {
|
export class SpaceEvent {
|
||||||
spaceId: string;
|
spaceId: string;
|
||||||
workspaceId: string;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
@@ -23,12 +22,12 @@ export class SpaceListener {
|
|||||||
|
|
||||||
@OnEvent(EventName.SPACE_DELETED)
|
@OnEvent(EventName.SPACE_DELETED)
|
||||||
async handleSpaceDeleted(event: SpaceEvent) {
|
async handleSpaceDeleted(event: SpaceEvent) {
|
||||||
const { spaceId, workspaceId } = event;
|
const { spaceId } = event;
|
||||||
if (this.isTypesense()) {
|
if (this.isTypesense()) {
|
||||||
await this.searchQueue.add(QueueJob.SPACE_DELETED, { spaceId });
|
await this.searchQueue.add(QueueJob.SPACE_DELETED, { spaceId });
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.aiQueue.add(QueueJob.SPACE_DELETED, { spaceId, workspaceId });
|
await this.aiQueue.add(QueueJob.SPACE_DELETED, { spaceId });
|
||||||
}
|
}
|
||||||
|
|
||||||
isTypesense(): boolean {
|
isTypesense(): boolean {
|
||||||
|
|||||||
@@ -46,10 +46,8 @@ export class SpaceMemberRepo {
|
|||||||
updatableSpaceMember: UpdatableSpaceMember,
|
updatableSpaceMember: UpdatableSpaceMember,
|
||||||
spaceMemberId: string,
|
spaceMemberId: string,
|
||||||
spaceId: string,
|
spaceId: string,
|
||||||
trx?: KyselyTransaction,
|
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const db = dbOrTx(this.db, trx);
|
await this.db
|
||||||
await db
|
|
||||||
.updateTable('spaceMembers')
|
.updateTable('spaceMembers')
|
||||||
.set(updatableSpaceMember)
|
.set(updatableSpaceMember)
|
||||||
.where('id', '=', spaceMemberId)
|
.where('id', '=', spaceMemberId)
|
||||||
@@ -94,13 +92,8 @@ export class SpaceMemberRepo {
|
|||||||
.execute();
|
.execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
async roleCountBySpaceId(
|
async roleCountBySpaceId(role: string, spaceId: string): Promise<number> {
|
||||||
role: string,
|
const { count } = await this.db
|
||||||
spaceId: string,
|
|
||||||
trx?: KyselyTransaction,
|
|
||||||
): Promise<number> {
|
|
||||||
const db = dbOrTx(this.db, trx);
|
|
||||||
const { count } = await db
|
|
||||||
.selectFrom('spaceMembers')
|
.selectFrom('spaceMembers')
|
||||||
.select((eb) => eb.fn.count('role').as('count'))
|
.select((eb) => eb.fn.count('role').as('count'))
|
||||||
.where('role', '=', role)
|
.where('role', '=', role)
|
||||||
|
|||||||
@@ -230,7 +230,6 @@ export class SpaceRepo {
|
|||||||
|
|
||||||
this.eventEmitter.emit(EventName.SPACE_DELETED, {
|
this.eventEmitter.emit(EventName.SPACE_DELETED, {
|
||||||
spaceId,
|
spaceId,
|
||||||
workspaceId,
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -211,24 +211,6 @@ export class WorkspaceRepo {
|
|||||||
.executeTakeFirst();
|
.executeTakeFirst();
|
||||||
}
|
}
|
||||||
|
|
||||||
async updateAiEmbeddingFingerprint(
|
|
||||||
workspaceId: string,
|
|
||||||
fingerprint: { driver: string; model: string; dimensions: number },
|
|
||||||
trx?: KyselyTransaction,
|
|
||||||
) {
|
|
||||||
const db = dbOrTx(this.db, trx);
|
|
||||||
return db
|
|
||||||
.updateTable('workspaces')
|
|
||||||
.set({
|
|
||||||
settings: sql`COALESCE(settings, '{}'::jsonb)
|
|
||||||
|| jsonb_build_object('ai', COALESCE(settings->'ai', '{}'::jsonb)
|
|
||||||
|| jsonb_build_object('embedding', ${JSON.stringify(fingerprint)}::text::jsonb))`,
|
|
||||||
updatedAt: new Date(),
|
|
||||||
})
|
|
||||||
.where('id', '=', workspaceId)
|
|
||||||
.execute();
|
|
||||||
}
|
|
||||||
|
|
||||||
async updateSharingSettings(
|
async updateSharingSettings(
|
||||||
workspaceId: string,
|
workspaceId: string,
|
||||||
prefKey: string,
|
prefKey: string,
|
||||||
|
|||||||
+1
-1
Submodule apps/server/src/ee updated: 6dfbcb9241...b38dc5ecd1
@@ -1,13 +0,0 @@
|
|||||||
export class UnableToInitialize extends Error {
|
|
||||||
constructor(message: string) {
|
|
||||||
super(`Unable to initialize the encryption service: ${message}`);
|
|
||||||
this.name = 'UnableToInitialize';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export class UnableToDecrypt extends Error {
|
|
||||||
constructor(reason: string) {
|
|
||||||
super(`Unable to decrypt the ciphertext: ${reason}`);
|
|
||||||
this.name = 'UnableToDecrypt';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
import { Global, Module } from '@nestjs/common';
|
|
||||||
import { EncryptionService } from './encryption.service';
|
|
||||||
|
|
||||||
@Global()
|
|
||||||
@Module({
|
|
||||||
providers: [EncryptionService],
|
|
||||||
exports: [EncryptionService],
|
|
||||||
})
|
|
||||||
export class EncryptionModule {}
|
|
||||||
@@ -1,184 +0,0 @@
|
|||||||
import { Test, TestingModule } from '@nestjs/testing';
|
|
||||||
import { EncryptionService } from './encryption.service';
|
|
||||||
import { UnableToDecrypt, UnableToInitialize } from './encryption.errors';
|
|
||||||
import { EnvironmentService } from '../environment/environment.service';
|
|
||||||
|
|
||||||
const APP_SECRET = 'test-app-secret-with-plenty-of-entropy-1234567890';
|
|
||||||
|
|
||||||
const buildService = (appSecret: string | undefined) => {
|
|
||||||
const env = { getAppSecret: () => appSecret } as EnvironmentService;
|
|
||||||
return new EncryptionService(env);
|
|
||||||
};
|
|
||||||
|
|
||||||
const decodeEnvelope = (encrypted: string) =>
|
|
||||||
JSON.parse(Buffer.from(encrypted, 'base64').toString()) as {
|
|
||||||
iv: string;
|
|
||||||
authTag: string;
|
|
||||||
cipherText: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
const encodeEnvelope = (envelope: {
|
|
||||||
iv: string;
|
|
||||||
authTag: string;
|
|
||||||
cipherText: string;
|
|
||||||
}) => Buffer.from(JSON.stringify(envelope)).toString('base64');
|
|
||||||
|
|
||||||
describe('EncryptionService', () => {
|
|
||||||
let service: EncryptionService;
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
|
||||||
providers: [
|
|
||||||
EncryptionService,
|
|
||||||
{
|
|
||||||
provide: EnvironmentService,
|
|
||||||
useValue: { getAppSecret: () => APP_SECRET },
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}).compile();
|
|
||||||
|
|
||||||
service = module.get<EncryptionService>(EncryptionService);
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('initialization', () => {
|
|
||||||
it('compiles via Nest DI', () => {
|
|
||||||
expect(service).toBeDefined();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('throws UnableToInitialize when APP_SECRET is missing', () => {
|
|
||||||
expect(() => buildService(undefined)).toThrow(UnableToInitialize);
|
|
||||||
expect(() => buildService('')).toThrow(UnableToInitialize);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('encrypt + decrypt round-trip', () => {
|
|
||||||
it('decrypts back to the original plaintext', () => {
|
|
||||||
const plaintext = 'hello world';
|
|
||||||
const encrypted = service.encrypt(plaintext);
|
|
||||||
expect(service.decrypt(encrypted)).toBe(plaintext);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('handles empty string', () => {
|
|
||||||
const encrypted = service.encrypt('');
|
|
||||||
expect(service.decrypt(encrypted)).toBe('');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('handles unicode (multi-byte UTF-8)', () => {
|
|
||||||
const plaintext = 'héllo 🔐 世界';
|
|
||||||
const encrypted = service.encrypt(plaintext);
|
|
||||||
expect(service.decrypt(encrypted)).toBe(plaintext);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('handles long plaintext (>1 block)', () => {
|
|
||||||
const plaintext = 'a'.repeat(10_000);
|
|
||||||
const encrypted = service.encrypt(plaintext);
|
|
||||||
expect(service.decrypt(encrypted)).toBe(plaintext);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('produces distinct ciphertexts for the same plaintext (random IV)', () => {
|
|
||||||
const plaintext = 'same input';
|
|
||||||
const a = service.encrypt(plaintext);
|
|
||||||
const b = service.encrypt(plaintext);
|
|
||||||
expect(a).not.toBe(b);
|
|
||||||
expect(service.decrypt(a)).toBe(plaintext);
|
|
||||||
expect(service.decrypt(b)).toBe(plaintext);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('cross-key isolation', () => {
|
|
||||||
it('cannot decrypt ciphertext produced under a different APP_SECRET', () => {
|
|
||||||
const other = buildService('totally-different-secret-value-9876543210');
|
|
||||||
const encrypted = service.encrypt('secret');
|
|
||||||
expect(() => other.decrypt(encrypted)).toThrow(UnableToDecrypt);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('tamper detection', () => {
|
|
||||||
it('rejects modified ciphertext', () => {
|
|
||||||
const encrypted = service.encrypt('hello');
|
|
||||||
const env = decodeEnvelope(encrypted);
|
|
||||||
const tamperedCipher = Buffer.from(env.cipherText, 'base64');
|
|
||||||
tamperedCipher[0] ^= 0x01;
|
|
||||||
const tampered = encodeEnvelope({
|
|
||||||
...env,
|
|
||||||
cipherText: tamperedCipher.toString('base64'),
|
|
||||||
});
|
|
||||||
expect(() => service.decrypt(tampered)).toThrow(UnableToDecrypt);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('rejects modified auth tag', () => {
|
|
||||||
const encrypted = service.encrypt('hello');
|
|
||||||
const env = decodeEnvelope(encrypted);
|
|
||||||
const tamperedTag = Buffer.from(env.authTag, 'base64');
|
|
||||||
tamperedTag[0] ^= 0x01;
|
|
||||||
const tampered = encodeEnvelope({
|
|
||||||
...env,
|
|
||||||
authTag: tamperedTag.toString('base64'),
|
|
||||||
});
|
|
||||||
expect(() => service.decrypt(tampered)).toThrow(UnableToDecrypt);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('rejects modified IV', () => {
|
|
||||||
const encrypted = service.encrypt('hello');
|
|
||||||
const env = decodeEnvelope(encrypted);
|
|
||||||
const tamperedIV = Buffer.from(env.iv, 'base64');
|
|
||||||
tamperedIV[0] ^= 0x01;
|
|
||||||
const tampered = encodeEnvelope({
|
|
||||||
...env,
|
|
||||||
iv: tamperedIV.toString('base64'),
|
|
||||||
});
|
|
||||||
expect(() => service.decrypt(tampered)).toThrow(UnableToDecrypt);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('malformed payloads', () => {
|
|
||||||
it('rejects non-base64 garbage', () => {
|
|
||||||
expect(() => service.decrypt('!!!not-valid-base64!!!')).toThrow(
|
|
||||||
UnableToDecrypt,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('rejects base64 of non-JSON', () => {
|
|
||||||
const garbage = Buffer.from('not json at all').toString('base64');
|
|
||||||
expect(() => service.decrypt(garbage)).toThrow(UnableToDecrypt);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('rejects JSON missing required fields', () => {
|
|
||||||
const partial = encodeEnvelope({
|
|
||||||
iv: Buffer.alloc(12).toString('base64'),
|
|
||||||
authTag: Buffer.alloc(16).toString('base64'),
|
|
||||||
} as never);
|
|
||||||
expect(() => service.decrypt(partial)).toThrow(UnableToDecrypt);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('rejects wrong-length IV', () => {
|
|
||||||
const encrypted = service.encrypt('hello');
|
|
||||||
const env = decodeEnvelope(encrypted);
|
|
||||||
const bad = encodeEnvelope({
|
|
||||||
...env,
|
|
||||||
iv: Buffer.alloc(8).toString('base64'),
|
|
||||||
});
|
|
||||||
expect(() => service.decrypt(bad)).toThrow(UnableToDecrypt);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('rejects wrong-length auth tag', () => {
|
|
||||||
const encrypted = service.encrypt('hello');
|
|
||||||
const env = decodeEnvelope(encrypted);
|
|
||||||
const bad = encodeEnvelope({
|
|
||||||
...env,
|
|
||||||
authTag: Buffer.alloc(8).toString('base64'),
|
|
||||||
});
|
|
||||||
expect(() => service.decrypt(bad)).toThrow(UnableToDecrypt);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('envelope format', () => {
|
|
||||||
it('returns base64 of JSON envelope with iv (12B), authTag (16B), cipherText', () => {
|
|
||||||
const encrypted = service.encrypt('hello');
|
|
||||||
const env = decodeEnvelope(encrypted);
|
|
||||||
expect(Buffer.from(env.iv, 'base64')).toHaveLength(12);
|
|
||||||
expect(Buffer.from(env.authTag, 'base64')).toHaveLength(16);
|
|
||||||
expect(Buffer.from(env.cipherText, 'base64').length).toBeGreaterThan(0);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,108 +0,0 @@
|
|||||||
// https://github.com/nhedger/nestjs-encryption - MIT
|
|
||||||
import { Injectable } from '@nestjs/common';
|
|
||||||
import {
|
|
||||||
createCipheriv,
|
|
||||||
createDecipheriv,
|
|
||||||
createHash,
|
|
||||||
randomBytes,
|
|
||||||
} from 'node:crypto';
|
|
||||||
import { UnableToDecrypt, UnableToInitialize } from './encryption.errors';
|
|
||||||
import { EnvironmentService } from '../environment/environment.service';
|
|
||||||
|
|
||||||
const ALGORITHM = 'aes-256-gcm';
|
|
||||||
const KEY_DOMAIN = 'docmost:encryption:v1';
|
|
||||||
const IV_LENGTH = 12;
|
|
||||||
const AUTH_TAG_LENGTH = 16;
|
|
||||||
|
|
||||||
type AEADPayload<TFormat = string | Buffer> = {
|
|
||||||
iv: TFormat;
|
|
||||||
authTag: TFormat;
|
|
||||||
cipherText: TFormat;
|
|
||||||
};
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class EncryptionService {
|
|
||||||
private readonly key: Buffer;
|
|
||||||
|
|
||||||
constructor(environmentService: EnvironmentService) {
|
|
||||||
const appSecret = environmentService.getAppSecret();
|
|
||||||
if (!appSecret) {
|
|
||||||
throw new UnableToInitialize('APP_SECRET is not set.');
|
|
||||||
}
|
|
||||||
this.key = createHash('sha256')
|
|
||||||
.update(KEY_DOMAIN)
|
|
||||||
.update(appSecret)
|
|
||||||
.digest();
|
|
||||||
}
|
|
||||||
|
|
||||||
public encrypt(plaintext: string): string {
|
|
||||||
const iv = randomBytes(IV_LENGTH);
|
|
||||||
const cipher = createCipheriv(ALGORITHM, this.key, iv);
|
|
||||||
const cipherText = Buffer.concat([
|
|
||||||
cipher.update(plaintext, 'utf8'),
|
|
||||||
cipher.final(),
|
|
||||||
]);
|
|
||||||
const authTag = cipher.getAuthTag();
|
|
||||||
|
|
||||||
const aead: AEADPayload<string> = {
|
|
||||||
iv: iv.toString('base64'),
|
|
||||||
authTag: authTag.toString('base64'),
|
|
||||||
cipherText: cipherText.toString('base64'),
|
|
||||||
};
|
|
||||||
|
|
||||||
return Buffer.from(JSON.stringify(aead)).toString('base64');
|
|
||||||
}
|
|
||||||
|
|
||||||
public decrypt(encrypted: string): string {
|
|
||||||
try {
|
|
||||||
const { iv, authTag, cipherText } = this.decodeAEADPayload(encrypted);
|
|
||||||
const decipher = createDecipheriv(ALGORITHM, this.key, iv);
|
|
||||||
decipher.setAuthTag(authTag);
|
|
||||||
const decrypted = Buffer.concat([
|
|
||||||
decipher.update(cipherText),
|
|
||||||
decipher.final(),
|
|
||||||
]);
|
|
||||||
return decrypted.toString('utf8');
|
|
||||||
} catch (e: unknown) {
|
|
||||||
throw new UnableToDecrypt((e as Error).message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private decodeAEADPayload(encodedPayload: string): AEADPayload<Buffer> {
|
|
||||||
const payload = Buffer.from(encodedPayload, 'base64');
|
|
||||||
|
|
||||||
let deserializedPkg: Record<string, unknown>;
|
|
||||||
try {
|
|
||||||
deserializedPkg = JSON.parse(payload.toString());
|
|
||||||
} catch {
|
|
||||||
throw new Error('The decoded AEAD payload is not a valid JSON string.');
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const field of ['iv', 'authTag', 'cipherText']) {
|
|
||||||
if (!Object.prototype.hasOwnProperty.call(deserializedPkg, field)) {
|
|
||||||
throw new Error(`The AEAD payload is missing the ${field} field.`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const iv = Buffer.from(deserializedPkg.iv as string, 'base64');
|
|
||||||
if (iv.length !== IV_LENGTH) {
|
|
||||||
throw new Error(
|
|
||||||
`The decoded IV is not the correct length. Expected ${IV_LENGTH} bytes, got ${iv.length} bytes.`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const authTag = Buffer.from(deserializedPkg.authTag as string, 'base64');
|
|
||||||
if (authTag.length !== AUTH_TAG_LENGTH) {
|
|
||||||
throw new Error(
|
|
||||||
`The decoded auth tag is not the correct length. Expected ${AUTH_TAG_LENGTH} bytes, got ${authTag.length} bytes.`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const cipherText = Buffer.from(
|
|
||||||
deserializedPkg.cipherText as string,
|
|
||||||
'base64',
|
|
||||||
);
|
|
||||||
|
|
||||||
return { iv, authTag, cipherText };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -310,31 +310,6 @@ export class EnvironmentService {
|
|||||||
return val === 'true';
|
return val === 'true';
|
||||||
}
|
}
|
||||||
|
|
||||||
getAiVectorDriver(): string {
|
|
||||||
return this.configService
|
|
||||||
.get<string>('AI_VECTOR_DRIVER', 'pgvector')
|
|
||||||
.toLowerCase();
|
|
||||||
}
|
|
||||||
|
|
||||||
getTurbopufferApiKey(): string {
|
|
||||||
return this.configService.get<string>('TURBOPUFFER_API_KEY');
|
|
||||||
}
|
|
||||||
|
|
||||||
getTurbopufferRegion(): string {
|
|
||||||
return this.configService.get<string>('TURBOPUFFER_REGION');
|
|
||||||
}
|
|
||||||
|
|
||||||
getTurbopufferBaseUrl(): string {
|
|
||||||
return this.configService.get<string>('TURBOPUFFER_BASE_URL');
|
|
||||||
}
|
|
||||||
|
|
||||||
getTurbopufferNamespacePrefix(): string {
|
|
||||||
return this.configService.get<string>(
|
|
||||||
'TURBOPUFFER_NAMESPACE_PREFIX',
|
|
||||||
'docmost',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
getOpenAiApiKey(): string {
|
getOpenAiApiKey(): string {
|
||||||
return this.configService.get<string>('OPENAI_API_KEY');
|
return this.configService.get<string>('OPENAI_API_KEY');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import {
|
|||||||
IsOptional,
|
IsOptional,
|
||||||
IsString,
|
IsString,
|
||||||
IsUrl,
|
IsUrl,
|
||||||
Matches,
|
|
||||||
MinLength,
|
MinLength,
|
||||||
ValidateIf,
|
ValidateIf,
|
||||||
validateSync,
|
validateSync,
|
||||||
@@ -109,41 +108,6 @@ export class EnvironmentVariables {
|
|||||||
@IsString()
|
@IsString()
|
||||||
AI_DRIVER: string;
|
AI_DRIVER: string;
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@ValidateIf((obj) => obj.AI_VECTOR_DRIVER)
|
|
||||||
@IsIn(['pgvector', 'turbopuffer'])
|
|
||||||
@IsString()
|
|
||||||
AI_VECTOR_DRIVER: string;
|
|
||||||
|
|
||||||
@ValidateIf((obj) => obj.AI_VECTOR_DRIVER === 'turbopuffer')
|
|
||||||
@IsNotEmpty()
|
|
||||||
@IsString()
|
|
||||||
TURBOPUFFER_API_KEY: string;
|
|
||||||
|
|
||||||
@ValidateIf(
|
|
||||||
(obj) =>
|
|
||||||
obj.AI_VECTOR_DRIVER === 'turbopuffer' && !obj.TURBOPUFFER_BASE_URL,
|
|
||||||
)
|
|
||||||
@IsNotEmpty({
|
|
||||||
message:
|
|
||||||
'TURBOPUFFER_REGION is required when AI_VECTOR_DRIVER is turbopuffer, unless TURBOPUFFER_BASE_URL is set',
|
|
||||||
})
|
|
||||||
@IsString()
|
|
||||||
TURBOPUFFER_REGION: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@ValidateIf((obj) => obj.TURBOPUFFER_BASE_URL != '' && obj.TURBOPUFFER_BASE_URL != null)
|
|
||||||
@IsUrl({ protocols: ['http', 'https'], require_tld: false })
|
|
||||||
TURBOPUFFER_BASE_URL: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString()
|
|
||||||
@Matches(/^[A-Za-z0-9\-_.]{1,90}$/, {
|
|
||||||
message:
|
|
||||||
'TURBOPUFFER_NAMESPACE_PREFIX may only contain letters, digits, dot, dash, underscore (max 90 chars)',
|
|
||||||
})
|
|
||||||
TURBOPUFFER_NAMESPACE_PREFIX: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsString()
|
@IsString()
|
||||||
AI_EMBEDDING_MODEL: string;
|
AI_EMBEDDING_MODEL: string;
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import {
|
|||||||
import { Injectable, Logger } from '@nestjs/common';
|
import { Injectable, Logger } from '@nestjs/common';
|
||||||
import { EnvironmentService } from '../environment/environment.service';
|
import { EnvironmentService } from '../environment/environment.service';
|
||||||
import { Redis } from 'ioredis';
|
import { Redis } from 'ioredis';
|
||||||
import { parseRedisUrl } from '../../common/helpers';
|
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class RedisHealthIndicator {
|
export class RedisHealthIndicator {
|
||||||
@@ -20,10 +19,8 @@ export class RedisHealthIndicator {
|
|||||||
const indicator = this.healthIndicatorService.check(key);
|
const indicator = this.healthIndicatorService.check(key);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const redisUrl = this.environmentService.getRedisUrl();
|
const redis = new Redis(this.environmentService.getRedisUrl(), {
|
||||||
const redis = new Redis(redisUrl, {
|
|
||||||
maxRetriesPerRequest: 15,
|
maxRetriesPerRequest: 15,
|
||||||
tls: parseRedisUrl(redisUrl).tls,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
await redis.ping();
|
await redis.ping();
|
||||||
|
|||||||
@@ -97,15 +97,6 @@ export function xwikiFormatter($: CheerioAPI, $root: Cheerio<any>) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function isBareLink($el: Cheerio<any>): boolean {
|
|
||||||
const href = $el.attr("href")?.trim();
|
|
||||||
const text = $el.text().trim();
|
|
||||||
|
|
||||||
if(!text || !href) return false
|
|
||||||
|
|
||||||
return text === href;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function defaultHtmlFormatter($: CheerioAPI, $root: Cheerio<any>) {
|
export function defaultHtmlFormatter($: CheerioAPI, $root: Cheerio<any>) {
|
||||||
normalizeTableColumnWidths($, $root);
|
normalizeTableColumnWidths($, $root);
|
||||||
|
|
||||||
@@ -113,9 +104,7 @@ export function defaultHtmlFormatter($: CheerioAPI, $root: Cheerio<any>) {
|
|||||||
const $el = $(el);
|
const $el = $(el);
|
||||||
const url = $el.attr('href')!;
|
const url = $el.attr('href')!;
|
||||||
const { provider } = getEmbedUrlAndProvider(url);
|
const { provider } = getEmbedUrlAndProvider(url);
|
||||||
if (provider === 'iframe' || !isBareLink($el)) {
|
if (provider === 'iframe') return;
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const embed = `<div data-type=\"embed\" data-src=\"${url}\" data-provider=\"${provider}\" data-align=\"center\" data-width=\"640\" data-height=\"480\"></div>`;
|
const embed = `<div data-type=\"embed\" data-src=\"${url}\" data-provider=\"${provider}\" data-align=\"center\" data-width=\"640\" data-height=\"480\"></div>`;
|
||||||
$el.replaceWith(embed);
|
$el.replaceWith(embed);
|
||||||
|
|||||||
@@ -61,7 +61,6 @@ export enum QueueJob {
|
|||||||
WORKSPACE_DELETED = 'workspace-deleted',
|
WORKSPACE_DELETED = 'workspace-deleted',
|
||||||
WORKSPACE_CREATE_EMBEDDINGS = 'workspace-create-embeddings',
|
WORKSPACE_CREATE_EMBEDDINGS = 'workspace-create-embeddings',
|
||||||
WORKSPACE_DELETE_EMBEDDINGS = 'workspace-delete-embeddings',
|
WORKSPACE_DELETE_EMBEDDINGS = 'workspace-delete-embeddings',
|
||||||
WORKSPACE_RESET_EMBEDDINGS = 'workspace-reset-embeddings',
|
|
||||||
|
|
||||||
GENERATE_PAGE_EMBEDDINGS = 'generate-page-embeddings',
|
GENERATE_PAGE_EMBEDDINGS = 'generate-page-embeddings',
|
||||||
DELETE_PAGE_EMBEDDINGS = 'delete-page-embeddings',
|
DELETE_PAGE_EMBEDDINGS = 'delete-page-embeddings',
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ import { GeneralQueueProcessor } from './processors/general-queue.processor';
|
|||||||
password: redisConfig.password,
|
password: redisConfig.password,
|
||||||
db: redisConfig.db,
|
db: redisConfig.db,
|
||||||
family: redisConfig.family,
|
family: redisConfig.family,
|
||||||
tls: redisConfig.tls,
|
|
||||||
retryStrategy: createRetryStrategy(),
|
retryStrategy: createRetryStrategy(),
|
||||||
},
|
},
|
||||||
defaultJobOptions: {
|
defaultJobOptions: {
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ export class RedisConfigService implements RedisOptionsFactory {
|
|||||||
password: redisConfig.password,
|
password: redisConfig.password,
|
||||||
db: redisConfig.db,
|
db: redisConfig.db,
|
||||||
family: redisConfig.family,
|
family: redisConfig.family,
|
||||||
tls: redisConfig.tls,
|
|
||||||
retryStrategy: createRetryStrategy(),
|
retryStrategy: createRetryStrategy(),
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -49,10 +49,6 @@ export class StaticModule implements OnModuleInit {
|
|||||||
: undefined,
|
: undefined,
|
||||||
POSTHOG_HOST: this.environmentService.getPostHogHost(),
|
POSTHOG_HOST: this.environmentService.getPostHogHost(),
|
||||||
POSTHOG_KEY: this.environmentService.getPostHogKey(),
|
POSTHOG_KEY: this.environmentService.getPostHogKey(),
|
||||||
AI_VECTOR_DRIVER:
|
|
||||||
this.environmentService.getAiVectorDriver() === 'turbopuffer'
|
|
||||||
? 'turbopuffer'
|
|
||||||
: undefined,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const windowScriptContent = `<script>window.CONFIG=${JSON.stringify(configString)};</script>`;
|
const windowScriptContent = `<script>window.CONFIG=${JSON.stringify(configString)};</script>`;
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { ThrottlerModule } from '@nestjs/throttler';
|
|||||||
import { ThrottlerStorageRedisService } from '@nest-lab/throttler-storage-redis';
|
import { ThrottlerStorageRedisService } from '@nest-lab/throttler-storage-redis';
|
||||||
import { EnvironmentService } from '../environment/environment.service';
|
import { EnvironmentService } from '../environment/environment.service';
|
||||||
import { EnvironmentModule } from '../environment/environment.module';
|
import { EnvironmentModule } from '../environment/environment.module';
|
||||||
import { createRetryStrategy, parseRedisUrl } from '../../common/helpers';
|
import { parseRedisUrl } from '../../common/helpers';
|
||||||
import { AUTH_THROTTLER, AI_CHAT_THROTTLER } from './throttler-names';
|
import { AUTH_THROTTLER, AI_CHAT_THROTTLER } from './throttler-names';
|
||||||
import Redis from 'ioredis';
|
import Redis from 'ioredis';
|
||||||
|
|
||||||
@@ -27,8 +27,6 @@ import Redis from 'ioredis';
|
|||||||
password: redisConfig.password,
|
password: redisConfig.password,
|
||||||
db: redisConfig.db,
|
db: redisConfig.db,
|
||||||
family: redisConfig.family,
|
family: redisConfig.family,
|
||||||
tls: redisConfig.tls,
|
|
||||||
retryStrategy: createRetryStrategy(),
|
|
||||||
keyPrefix: 'throttle:',
|
keyPrefix: 'throttle:',
|
||||||
}),
|
}),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ export class WsRedisIoAdapter extends IoAdapter {
|
|||||||
|
|
||||||
const options: RedisOptions = {
|
const options: RedisOptions = {
|
||||||
family: this.redisConfig.family,
|
family: this.redisConfig.family,
|
||||||
tls: this.redisConfig.tls,
|
|
||||||
retryStrategy: createRetryStrategy(),
|
retryStrategy: createRetryStrategy(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -73,13 +73,9 @@ export const embedProviders: IEmbedProvider[] = [
|
|||||||
id: "vimeo",
|
id: "vimeo",
|
||||||
name: "Vimeo",
|
name: "Vimeo",
|
||||||
regex:
|
regex:
|
||||||
/^(https:)?\/\/(?:www\.|player\.)?vimeo.com\/(?:channels\/(?:\w+\/)?|groups\/([^/]*)\/videos\/|album\/(\d+)\/video\/|video\/|)(\d+)(?:\/([\da-zA-Z]+))?/,
|
/^(https:)?\/\/(?:www\.|player\.)?vimeo.com\/(?:channels\/(?:\w+\/)?|groups\/([^/]*)\/videos\/|album\/(\d+)\/video\/|video\/|)(\d+)/,
|
||||||
getEmbedUrl: (match, url: string) => {
|
getEmbedUrl: (match) => {
|
||||||
// preserve ?h= hash for unlisted videos
|
return `https://player.vimeo.com/video/${match[4]}`;
|
||||||
const hash =
|
|
||||||
match[5] ?? new URL(url, "https://vimeo.com").searchParams.get("h");
|
|
||||||
const base = `https://player.vimeo.com/video/${match[4]}`;
|
|
||||||
return hash ? `${base}?h=${hash}` : base;
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
Generated
+285
-200
File diff suppressed because it is too large
Load Diff
+2
-2
@@ -6,12 +6,12 @@ patchedDependencies:
|
|||||||
overrides:
|
overrides:
|
||||||
prosemirror-changeset: 2.4.0
|
prosemirror-changeset: 2.4.0
|
||||||
glob: 13.0.6
|
glob: 13.0.6
|
||||||
ws: 8.21.3
|
ws: 8.21.0
|
||||||
dompurify: 3.4.13
|
dompurify: 3.4.13
|
||||||
mermaid: 11.16.1
|
mermaid: 11.16.1
|
||||||
undici: 7.29.0
|
undici: 7.29.0
|
||||||
tmp: 0.2.7
|
tmp: 0.2.7
|
||||||
nanoid@^3: 3.3.18
|
nanoid@^3: 3.3.17
|
||||||
lodash-es: 4.18.1
|
lodash-es: 4.18.1
|
||||||
express-rate-limit: 8.2.2
|
express-rate-limit: 8.2.2
|
||||||
flatted: 3.4.2
|
flatted: 3.4.2
|
||||||
|
|||||||
Reference in New Issue
Block a user