mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-02-13 21:05:19 +00:00
chore(server): support disable indexer plugin (#12408)
close CLOUD-220 <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Introduced a new service to handle indexing-related events and scheduled tasks, improving the management of document and workspace indexing. - Added support for configuring the indexer feature via the AFFINE_INDEXER_ENABLED environment variable. - **Bug Fixes** - Ensured that indexing and deletion jobs are only enqueued when the indexer feature is enabled. - **Tests** - Added comprehensive tests for the new indexing event service, covering various configuration scenarios. - Removed obsolete test related to auto-indexing scheduling. - **Chores** - Updated configuration descriptions and mappings to improve clarity and environment variable support. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
@@ -32,13 +32,9 @@ declare global {
|
||||
docId: string;
|
||||
blob: Buffer;
|
||||
};
|
||||
'doc.created': {
|
||||
workspaceId: string;
|
||||
docId: string;
|
||||
editor?: string;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class PgWorkspaceDocStorageAdapter extends DocStorageAdapter {
|
||||
protected override readonly logger = new Logger(
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
|
||||
import { JobQueue, OnEvent } from '../../base';
|
||||
import { OnEvent } from '../../base';
|
||||
import { Models } from '../../models';
|
||||
import { PgWorkspaceDocStorageAdapter } from './adapters/workspace';
|
||||
import { DocReader } from './reader';
|
||||
@@ -10,8 +10,7 @@ export class DocEventsListener {
|
||||
constructor(
|
||||
private readonly docReader: DocReader,
|
||||
private readonly models: Models,
|
||||
private readonly workspace: PgWorkspaceDocStorageAdapter,
|
||||
private readonly queue: JobQueue
|
||||
private readonly workspace: PgWorkspaceDocStorageAdapter
|
||||
) {}
|
||||
|
||||
@OnEvent('doc.snapshot.updated')
|
||||
@@ -29,17 +28,6 @@ export class DocEventsListener {
|
||||
return;
|
||||
}
|
||||
await this.models.doc.upsertMeta(workspaceId, docId, content);
|
||||
await this.queue.add(
|
||||
'indexer.indexDoc',
|
||||
{
|
||||
workspaceId,
|
||||
docId,
|
||||
},
|
||||
{
|
||||
jobId: `indexDoc/${workspaceId}/${docId}`,
|
||||
priority: 100,
|
||||
}
|
||||
);
|
||||
} else {
|
||||
// update workspace content to database
|
||||
const content = this.docReader.parseWorkspaceContent(blob);
|
||||
@@ -47,16 +35,6 @@ export class DocEventsListener {
|
||||
return;
|
||||
}
|
||||
await this.models.workspace.update(workspaceId, content);
|
||||
await this.queue.add(
|
||||
'indexer.indexWorkspace',
|
||||
{
|
||||
workspaceId,
|
||||
},
|
||||
{
|
||||
jobId: `indexWorkspace/${workspaceId}`,
|
||||
priority: 100,
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,16 +42,6 @@ export class DocEventsListener {
|
||||
async clearUserWorkspaces(payload: Events['user.deleted']) {
|
||||
for (const workspace of payload.ownedWorkspaces) {
|
||||
await this.workspace.deleteSpace(workspace);
|
||||
await this.queue.add(
|
||||
'indexer.deleteWorkspace',
|
||||
{
|
||||
workspaceId: workspace,
|
||||
},
|
||||
{
|
||||
jobId: `deleteWorkspace/${workspace}`,
|
||||
priority: 0,
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,11 +3,25 @@ import { Transactional } from '@nestjs-cls/transactional';
|
||||
import type { Update } from '@prisma/client';
|
||||
import { Prisma } from '@prisma/client';
|
||||
|
||||
import { PaginationInput } from '../base';
|
||||
import { EventBus, PaginationInput } from '../base';
|
||||
import { DocIsNotPublic } from '../base/error';
|
||||
import { BaseModel } from './base';
|
||||
import { Doc, DocRole, PublicDocMode, publicUserSelect } from './common';
|
||||
|
||||
declare global {
|
||||
interface Events {
|
||||
'doc.created': {
|
||||
workspaceId: string;
|
||||
docId: string;
|
||||
editor?: string;
|
||||
};
|
||||
'doc.updated': {
|
||||
workspaceId: string;
|
||||
docId: string;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
export type DocMetaUpsertInput = Omit<
|
||||
Prisma.WorkspaceDocUncheckedCreateInput,
|
||||
'workspaceId' | 'docId'
|
||||
@@ -24,6 +38,10 @@ export type DocMetaUpsertInput = Omit<
|
||||
*/
|
||||
@Injectable()
|
||||
export class DocModel extends BaseModel {
|
||||
constructor(private readonly event: EventBus) {
|
||||
super();
|
||||
}
|
||||
|
||||
// #region Update
|
||||
|
||||
private updateToDocRecord(row: Update): Doc {
|
||||
@@ -338,7 +356,7 @@ export class DocModel extends BaseModel {
|
||||
docId: string,
|
||||
data?: DocMetaUpsertInput
|
||||
) {
|
||||
return await this.db.workspaceDoc.upsert({
|
||||
const doc = await this.db.workspaceDoc.upsert({
|
||||
where: {
|
||||
workspaceId_docId: {
|
||||
workspaceId,
|
||||
@@ -354,6 +372,11 @@ export class DocModel extends BaseModel {
|
||||
docId,
|
||||
},
|
||||
});
|
||||
this.event.emit('doc.updated', {
|
||||
workspaceId,
|
||||
docId,
|
||||
});
|
||||
return doc;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
import test from 'ava';
|
||||
import Sinon from 'sinon';
|
||||
|
||||
import { createModule } from '../../../__tests__/create-module';
|
||||
import { Config } from '../../../base';
|
||||
import { IndexerModule } from '..';
|
||||
import { IndexerEvent } from '../event';
|
||||
|
||||
const module = await createModule({
|
||||
imports: [IndexerModule],
|
||||
});
|
||||
const indexerEvent = module.get(IndexerEvent);
|
||||
const config = module.get(Config);
|
||||
|
||||
test.after.always(async () => {
|
||||
await module.close();
|
||||
});
|
||||
|
||||
test.afterEach.always(() => {
|
||||
Sinon.restore();
|
||||
});
|
||||
|
||||
test('should not index workspace if indexer is disabled', async t => {
|
||||
Sinon.stub(config.indexer, 'enabled').value(false);
|
||||
const count = module.queue.count('indexer.indexWorkspace');
|
||||
|
||||
// @ts-expect-error ignore missing fields
|
||||
await indexerEvent.indexWorkspace({ id: 'test-workspace' });
|
||||
|
||||
t.is(module.queue.count('indexer.indexWorkspace'), count);
|
||||
});
|
||||
|
||||
test('should index workspace if indexer is enabled', async t => {
|
||||
// @ts-expect-error ignore missing fields
|
||||
await indexerEvent.indexWorkspace({ id: 'test-workspace' });
|
||||
|
||||
const { payload } = await module.queue.waitFor('indexer.indexWorkspace');
|
||||
t.is(payload.workspaceId, 'test-workspace');
|
||||
});
|
||||
|
||||
test('should not delete workspace if indexer is disabled', async t => {
|
||||
Sinon.stub(config.indexer, 'enabled').value(false);
|
||||
const count = module.queue.count('indexer.deleteWorkspace');
|
||||
|
||||
// @ts-expect-error ignore missing fields
|
||||
await indexerEvent.deleteUserWorkspaces({
|
||||
ownedWorkspaces: ['test-workspace'],
|
||||
});
|
||||
|
||||
t.is(module.queue.count('indexer.deleteWorkspace'), count);
|
||||
});
|
||||
|
||||
test('should delete workspace if indexer is enabled', async t => {
|
||||
// @ts-expect-error ignore missing fields
|
||||
await indexerEvent.deleteUserWorkspaces({
|
||||
ownedWorkspaces: ['test-workspace'],
|
||||
});
|
||||
|
||||
const { payload } = await module.queue.waitFor('indexer.deleteWorkspace');
|
||||
t.is(payload.workspaceId, 'test-workspace');
|
||||
});
|
||||
|
||||
test('should not schedule auto index workspaces if indexer is disabled', async t => {
|
||||
Sinon.stub(config.indexer, 'enabled').value(false);
|
||||
const count = module.queue.count('indexer.autoIndexWorkspaces');
|
||||
|
||||
await indexerEvent.autoIndexWorkspaces();
|
||||
|
||||
t.is(module.queue.count('indexer.autoIndexWorkspaces'), count);
|
||||
});
|
||||
|
||||
test('should schedule auto index workspaces', async t => {
|
||||
await indexerEvent.autoIndexWorkspaces();
|
||||
|
||||
const { payload } = await module.queue.waitFor('indexer.autoIndexWorkspaces');
|
||||
t.is(payload.lastIndexedWorkspaceSid, undefined);
|
||||
});
|
||||
@@ -175,10 +175,3 @@ test('should not index workspace if snapshot not exists', async t => {
|
||||
|
||||
t.is(module.queue.count('indexer.indexWorkspace'), count);
|
||||
});
|
||||
|
||||
test('should schedule auto index workspaces', async t => {
|
||||
await indexerJob.scheduleAutoIndexWorkspaces();
|
||||
|
||||
const { payload } = await module.queue.waitFor('indexer.autoIndexWorkspaces');
|
||||
t.is(payload.lastIndexedWorkspaceSid, undefined);
|
||||
});
|
||||
|
||||
@@ -31,6 +31,7 @@ defineModuleConfig('indexer', {
|
||||
enabled: {
|
||||
desc: 'Enable indexer plugin',
|
||||
default: true,
|
||||
env: ['AFFINE_INDEXER_ENABLED', 'boolean'],
|
||||
},
|
||||
'provider.type': {
|
||||
desc: 'Indexer search service provider name',
|
||||
|
||||
86
packages/backend/server/src/plugins/indexer/event.ts
Normal file
86
packages/backend/server/src/plugins/indexer/event.ts
Normal file
@@ -0,0 +1,86 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { Cron, CronExpression } from '@nestjs/schedule';
|
||||
|
||||
import { Config, JobQueue, OnEvent } from '../../base';
|
||||
|
||||
@Injectable()
|
||||
export class IndexerEvent {
|
||||
constructor(
|
||||
private readonly queue: JobQueue,
|
||||
private readonly config: Config
|
||||
) {}
|
||||
|
||||
@OnEvent('doc.updated')
|
||||
async indexDoc({ workspaceId, docId }: Events['doc.updated']) {
|
||||
if (!this.config.indexer.enabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
await this.queue.add(
|
||||
'indexer.indexDoc',
|
||||
{
|
||||
workspaceId,
|
||||
docId,
|
||||
},
|
||||
{
|
||||
jobId: `indexDoc/${workspaceId}/${docId}`,
|
||||
priority: 100,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@OnEvent('workspace.updated')
|
||||
async indexWorkspace({ id }: Events['workspace.updated']) {
|
||||
if (!this.config.indexer.enabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
await this.queue.add(
|
||||
'indexer.indexWorkspace',
|
||||
{
|
||||
workspaceId: id,
|
||||
},
|
||||
{
|
||||
jobId: `indexWorkspace/${id}`,
|
||||
priority: 100,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@OnEvent('user.deleted')
|
||||
async deleteUserWorkspaces(payload: Events['user.deleted']) {
|
||||
if (!this.config.indexer.enabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (const workspace of payload.ownedWorkspaces) {
|
||||
await this.queue.add(
|
||||
'indexer.deleteWorkspace',
|
||||
{
|
||||
workspaceId: workspace,
|
||||
},
|
||||
{
|
||||
jobId: `deleteWorkspace/${workspace}`,
|
||||
priority: 0,
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@Cron(CronExpression.EVERY_30_SECONDS)
|
||||
async autoIndexWorkspaces() {
|
||||
if (!this.config.indexer.enabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
await this.queue.add(
|
||||
'indexer.autoIndexWorkspaces',
|
||||
{},
|
||||
{
|
||||
// make sure only one job is running at a time
|
||||
delay: 30 * 1000,
|
||||
jobId: 'autoIndexWorkspaces',
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,7 @@ import { Module } from '@nestjs/common';
|
||||
|
||||
import { ServerConfigModule } from '../../core/config';
|
||||
import { PermissionModule } from '../../core/permission';
|
||||
import { IndexerEvent } from './event';
|
||||
import { SearchProviderFactory } from './factory';
|
||||
import { IndexerJob } from './job';
|
||||
import { SearchProviders } from './providers';
|
||||
@@ -16,6 +17,7 @@ import { IndexerService } from './service';
|
||||
IndexerResolver,
|
||||
IndexerService,
|
||||
IndexerJob,
|
||||
IndexerEvent,
|
||||
SearchProviderFactory,
|
||||
...SearchProviders,
|
||||
],
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { Injectable, Logger } from '@nestjs/common';
|
||||
import { Cron, CronExpression } from '@nestjs/schedule';
|
||||
|
||||
import { Config, JOB_SIGNAL, JobQueue, OnJob } from '../../base';
|
||||
import { readAllDocIdsFromWorkspaceSnapshot } from '../../core/utils/blocksuite';
|
||||
@@ -184,20 +183,4 @@ export class IndexerJob {
|
||||
payload.lastIndexedWorkspaceSid = nextSid;
|
||||
return JOB_SIGNAL.Repeat;
|
||||
}
|
||||
|
||||
@Cron(CronExpression.EVERY_30_SECONDS)
|
||||
async scheduleAutoIndexWorkspaces() {
|
||||
if (!this.config.indexer.enabled) {
|
||||
return;
|
||||
}
|
||||
await this.queue.add(
|
||||
'indexer.autoIndexWorkspaces',
|
||||
{},
|
||||
{
|
||||
// make sure only one job is running at a time
|
||||
delay: 30 * 1000,
|
||||
jobId: 'autoIndexWorkspaces',
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user