Oak-Team
/
oak-backend-base
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 18 Wiki Activity

在判断数据是否应该发送时,尽量使用相容性检测

This commit is contained in:
Xu Chang 2023-10-07 11:17:30 +08:00
parent a544e449ed
commit 64fa1c470f
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/DataSubscriber.js
View File

@ -91,13 +91,22 @@ class DataSubscriber {
}
});
}
sendRecord(entity, filter, record, sid) {
sendRecord(entity, filter, record, sid, isCreate) {
if (this.filterMap[entity]) {
Object.keys(this.filterMap[entity]).forEach(async (room) => {
const context = await this.contextBuilder();
const filter2 = this.filterMap[entity][room];
const repeled = await (0, oak_domain_1.checkFilterRepel)(entity, context, filter, filter2, true);
if (!repeled) {
let needSend = false;
if (isCreate) {
// 如果是插入数据肯定是单行，使用相容性检测
const contained = await (0, oak_domain_1.checkFilterContains)(entity, context, filter, filter2, true);
needSend = contained;
}
else {
const repeled = await (0, oak_domain_1.checkFilterRepel)(entity, context, filter, filter2, true);
needSend = !repeled;
}
if (needSend) {
if (sid) {
this.ns.to(room).except(sid).emit('data', [record], [room]);
}
@ -116,7 +125,7 @@ class DataSubscriber {
switch (a) {
case 'c': {
const { e, d } = record;
this.sendRecord(e, d, record, sid);
this.sendRecord(e, d, record, sid, true);
break;
}
case 'u': {

19
src/DataSubscriber.ts
View File

@ -4,7 +4,7 @@ import { EntityDict, SubDataDef, OpRecord, CreateOpResult, UpdateOpResult, Remov
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
import { BackendRuntimeContext } from 'oak-frontend-base';
import { Namespace } from 'socket.io';
import { checkFilterRepel } from 'oak-domain';
import { checkFilterContains, checkFilterRepel } from 'oak-domain';
export default class DataSubscriber<ED extends EntityDict & BaseEntityDict, Context extends BackendRuntimeContext<ED>> {
@ -113,14 +113,23 @@ export default class DataSubscriber<ED extends EntityDict & BaseEntityDict, Cont
});
}
private sendRecord(entity: keyof ED, filter: ED[keyof ED]['Selection']['filter'], record: OpRecord<ED>, sid?: string) {
private sendRecord(entity: keyof ED, filter: ED[keyof ED]['Selection']['filter'], record: OpRecord<ED>, sid?: string, isCreate?: boolean) {
if (this.filterMap[entity]) {
Object.keys(this.filterMap[entity]!).forEach(
async (room) => {
const context = await this.contextBuilder();
const filter2 = this.filterMap[entity]![room];
const repeled = await checkFilterRepel(entity, context, filter, filter2, true)
if (!repeled) {
let needSend = false;
if (isCreate) {
// 如果是插入数据肯定是单行，使用相容性检测
const contained = await checkFilterContains(entity, context, filter, filter2, true);
needSend = contained;
}
else {
const repeled = await checkFilterRepel(entity, context, filter, filter2, true);
needSend = !repeled;
}
if (needSend) {
if (sid) {
this.ns.to(room).except(sid).emit('data', [record], [room]);
}
@ -142,7 +151,7 @@ export default class DataSubscriber<ED extends EntityDict & BaseEntityDict, Cont
switch (a) {
case 'c': {
const { e, d } = record as CreateOpResult<ED, keyof ED>;
this.sendRecord(e, d, record, sid);
this.sendRecord(e, d, record, sid, true);
break;
}
case 'u': {