oak-domain 5.1.13 → 5.1.15

package/lib/store/CascadeStore.d.ts

@@ -69,6 +69,7 @@ export declare abstract class CascadeStore<ED extends EntityDict & BaseEntityDic
     protected preProcessDataCreated<T extends keyof ED>(entity: T, data: ED[T]['Create']['data']): void;
     protected preProcessDataUpdated(action: string, data: Record<string, any>, async?: true): void;
     judgeRelation(entity: keyof ED, attr: string): string | 1 | 2 | string[] | 0 | -1;
+    private tryMergeModi;
     /**
      * 和具体的update过程无关的例程放在这里，包括对later动作的处理、对oper的记录以及对record的收集等
      * @param entity

package/lib/store/CascadeStore.js

@@ -1051,6 +1051,118 @@ class CascadeStore extends RowStore_1.RowStore {
     judgeRelation(entity, attr) {
         return (0, relation_1.judgeRelation)(this.storageSchema, entity, attr);
     }
+    async tryMergeModi(entity, operation, context, ids, option) {
+        const { action, data, filter, id: operId } = operation;
+        const [upsertModi] = await this.selectAbjointRowAsync('modi', {
+            data: {
+                id: 1,
+                data: 1,
+                action: 1,
+            },
+            filter: {
+                targetEntity: entity,
+                iState: 'active',
+                filter: ids.length > 0 ? {
+                    id: {
+                        $in: ids,
+                    },
+                } : {
+                    id: ids[0],
+                },
+            },
+            sorter: [
+                {
+                    $attr: {
+                        $$createAt$$: 1,
+                    },
+                    $direction: 'desc',
+                }
+            ],
+            indexFrom: 0,
+            count: 1,
+        }, context, option);
+        if (upsertModi) {
+            const { data: data2, id: id2, action: action2 } = upsertModi;
+            if (action === 'remove') {
+                // 之前的都不做数
+                if (action2 === 'create') {
+                    // 对冲掉
+                    return {
+                        id: await (0, uuid_1.generateNewIdAsync)(),
+                        action: 'remove',
+                        data: {},
+                        filter: {
+                            id: upsertModi.id,
+                        },
+                    };
+                }
+                else {
+                    // 直接把这个改成删除
+                    (0, assert_1.default)(action2 !== 'remove');
+                    return {
+                        id: await (0, uuid_1.generateNewIdAsync)(),
+                        action: 'update',
+                        data: {
+                            action,
+                            data,
+                        },
+                        filter: {
+                            id: upsertModi.id,
+                        },
+                    };
+                }
+            }
+            else {
+                // 是update，直接把原来的data覆盖掉
+                if (action !== action2 && process.env.NODE_ENV === 'development') {
+                    // 这种情况感觉是不会发生的
+                    console.warn('发生了同一行数据的modi的action不一致，请注意查看');
+                }
+                return {
+                    id: 'dummy',
+                    action: 'update',
+                    data: {
+                        data: Object.assign({}, data2, data),
+                    },
+                    filter: {
+                        id: id2,
+                    }
+                };
+            }
+        }
+        // 说明没有已有的modi，必须要创建新的，此时应当在option中有相应的parentEntity/Id
+        const { modiParentEntity, modiParentId } = option;
+        (0, assert_1.default)(modiParentEntity && modiParentId);
+        return {
+            id: 'dummy',
+            action: 'create',
+            data: {
+                id: operId,
+                targetEntity: entity,
+                entity: modiParentEntity,
+                entityId: modiParentId,
+                action,
+                data,
+                iState: 'active',
+                filter: ids.length > 0 ? {
+                    id: {
+                        $in: ids,
+                    },
+                } : {
+                    id: ids[0],
+                },
+                modiEntity$modi: {
+                    id: 'dummy',
+                    action: 'create',
+                    data: await Promise.all(ids.map(async (id) => ({
+                        id: await (0, uuid_1.generateNewIdAsync)(),
+                        entity: entity,
+                        entityId: id,
+                    }))),
+                }
+            },
+        };
+    }
     /**
      * 和具体的update过程无关的例程放在这里，包括对later动作的处理、对oper的记录以及对record的收集等
      * @param entity
@@ -1282,137 +1394,18 @@ class CascadeStore extends RowStore_1.RowStore {
                 if (data) {
                     this.preProcessDataUpdated(action, data, true);
                 }
-                if (option.modiParentEntity && !['modi', 'modiEntity'].includes(entity)) {
-                    // 延时更新，变成对modi的插入
-                    // 变成对modi的插入
-                    // 优化，这里如果是对同一个targetEntity反复update，则变成对最后一条create/update的modi进行update，以避免发布文章这样的需求时产生过多的modi
-                    let modiUpsert;
-                    if (action === 'update') {
-                        // 如果action本身是update，且没有实际update属性，这里可以忽略
-                        const updateAttrCount = Object.keys(data).length;
-                        if (updateAttrCount === 0) {
-                            return {};
-                        }
-                        // 尝试和当前targetEntity的最后一条create/update进行合并，优化modi的条数
-                        const upsertModis = await this.selectAbjointRowAsync('modi', {
-                            data: {
-                                id: 1,
-                                data: 1,
-                                action: 1,
-                            },
-                            filter: {
-                                targetEntity: entity,
-                                entity: option.modiParentEntity,
-                                entityId: option.modiParentId,
-                                iState: 'active',
-                                filter: ids.length > 0 ? {
-                                    id: {
-                                        $in: ids,
-                                    },
-                                } : filter,
-                            },
-                            sorter: [
-                                {
-                                    $attr: {
-                                        $$createAt$$: 1,
-                                    },
-                                    $direction: 'desc',
-                                }
-                            ],
-                            indexFrom: 0,
-                            count: 1,
-                        }, context, option);
-                        if (upsertModis.length > 0) {
-                            const { data: originData, id: originId, action } = upsertModis[0];
-                            if (['create', 'update'].includes(action)) {
-                                modiUpsert = {
-                                    id: 'dummy',
-                                    action: 'update',
-                                    data: {
-                                        data: Object.assign({}, originData, data),
-                                    },
-                                    filter: {
-                                        id: originId,
-                                    }
-                                };
-                            }
-                        }
-                    }
-                    if (!modiUpsert) {
-                        modiUpsert = {
-                            id: 'dummy',
-                            action: 'create',
-                            data: {
-                                id: operId,
-                                targetEntity: entity,
-                                entity: option.modiParentEntity,
-                                entityId: option.modiParentId,
-                                action,
-                                data,
-                                iState: 'active',
-                                filter,
-                            },
-                        };
-                        if (ids.length > 0) {
-                            modiUpsert.data.modiEntity$modi = {
-                                id: 'dummy',
-                                action: 'create',
-                                data: await Promise.all(ids.map(async (id) => ({
-                                    id: await (0, uuid_1.generateNewIdAsync)(),
-                                    entity: entity,
-                                    entityId: id,
-                                }))),
-                            };
-                        }
-                    }
+                const createModi = async () => {
+                    const modiOperation = await this.tryMergeModi(entity, operation, context, ids, option);
                     const closeRootMode = context.openRootMode();
-                    await this.cascadeUpdateAsync('modi', modiUpsert, context, option);
+                    await this.cascadeUpdateAsync('modi', modiOperation, context, option);
                     closeRootMode();
                     return {
                         modi: {
                             ['create']: 1,
                         },
                     };
-                }
-                else {
-                    const createOper = async () => {
-                        if (!option.dontCreateOper && !['oper', 'operEntity', 'modiEntity', 'modi', 'log'].includes(entity) && ids.length > 0) {
-                            // 按照框架要求生成Oper和OperEntity这两个内置的对象
-                            (0, assert_1.default)(operId);
-                            const operatorId = context.getCurrentUserId(true);
-                            const createOper = {
-                                id: 'dummy',
-                                action: 'create',
-                                data: {
-                                    id: operId,
-                                    action,
-                                    data,
-                                    targetEntity: entity,
-                                    bornAt,
-                                    operatorId,
-                                    operEntity$oper: {
-                                        id: 'dummy',
-                                        action: 'create',
-                                        data: await Promise.all(ids.map(async (ele) => ({
-                                            id: await (0, uuid_1.generateNewIdAsync)(),
-                                            entityId: ele,
-                                            entity: entity,
-                                        })))
-                                    },
-                                    filter: {
-                                        id: { $in: ids },
-                                    },
-                                    logId: entity === 'log' ? undefined : option.logId,
-                                    undoData,
-                                },
-                            };
-                            const closeRootMode = context.openRootMode();
-                            await this.cascadeUpdateAsync('oper', createOper, context, {
-                                dontCollect: !option.logId, // 如果是在创建log，则把oper收集回去
-                            });
-                            closeRootMode();
-                        }
-                    };
+                };
+                const saveRecordAndCreateOper = async () => {
                     if (action === 'remove') {
                         if (!option.dontCollect) {
                             context.saveOpRecord(entity, {
@@ -1443,17 +1436,70 @@ class CascadeStore extends RowStore_1.RowStore {
                                 });
                             }
                         }
-                        else {
-                            return {};
-                        }
                     }
-                    await this.updateAbjointRowAsync(entity, operation, context, option);
-                    await createOper();
+                    if (!option.dontCreateOper && !['oper', 'operEntity', 'modiEntity', 'modi', 'log'].includes(entity) && ids.length > 0) {
+                        // 按照框架要求生成Oper和OperEntity这两个内置的对象
+                        (0, assert_1.default)(operId);
+                        const operatorId = context.getCurrentUserId(true);
+                        const createOper = {
+                            id: 'dummy',
+                            action: 'create',
+                            data: {
+                                id: operId,
+                                action,
+                                data,
+                                targetEntity: entity,
+                                bornAt,
+                                operatorId,
+                                operEntity$oper: {
+                                    id: 'dummy',
+                                    action: 'create',
+                                    data: await Promise.all(ids.map(async (ele) => ({
+                                        id: await (0, uuid_1.generateNewIdAsync)(),
+                                        entityId: ele,
+                                        entity: entity,
+                                    })))
+                                },
+                                filter: {
+                                    id: { $in: ids },
+                                },
+                                logId: entity === 'log' ? undefined : option.logId,
+                                undoData,
+                            },
+                        };
+                        const closeRootMode = context.openRootMode();
+                        await this.cascadeUpdateAsync('oper', createOper, context, {
+                            dontCollect: !option.logId, // 如果是在创建log，则把oper收集回去
+                        });
+                        closeRootMode();
+                    }
                     return {
                         [entity]: {
                             [action]: ids.length,
                         }
                     };
+                };
+                if (action !== 'remove' && Object.keys(data).length === 0) {
+                    if (action !== 'update') {
+                        // 如果不是update，这里还是记一条oper
+                        return saveRecordAndCreateOper();
+                    }
+                    return {};
+                }
+                if (option.modiParentEntity && !['modi', 'modiEntity'].includes(entity)) {
+                    // 延时更新，变成对modi的操作
+                    return createModi();
+                }
+                else {
+                    const count = await this.updateAbjointRowAsync(entity, operation, context, option);
+                    if (count === ids.length) {
+                        return await saveRecordAndCreateOper();
+                    }
+                    else {
+                        // 如果没有更新到行，说明这些数据还在modi当中
+                        (0, assert_1.default)(count === 0, 'update成功的行数只能为id所在行数或者0');
+                        return await createModi();
+                    }
                 }
             }
         }

package/lib/store/RelationAuth.js

@@ -352,12 +352,47 @@ class RelationAuth {
                 const dealWithData = (rows) => {
                     // 这里如果entity指向不同的实体，一般出现这样的查询，则其权限应当不由这条deduce路径处理
                     // 同上，如果找到的行数大于1行，说明deduce路径上的对象不确定，也暂不处理  by Xc 20230725
-                    if (rows.length > 1 || rows.length === 0) {
+                    if (rows.length > 1) {
                         if (process.env.NODE_ENV === 'development') {
                             console.warn(`进行deduce推导时找到了${rows.length}行${entity}数据`);
                         }
                         return entityFilters;
                     }
+                    else if (rows.length === 0) {
+                        // 说明没有找到行，这时候有一种可能是modi。这时候只能假设是指定id更新了，其它情况很难处理。by Xc
+                        if (filter.id) {
+                            // 用modi对应的entity/entityId来判定
+                            const modies = context.select('modi', {
+                                data: {
+                                    id: 1,
+                                    data: 1,
+                                    entity: 1,
+                                    entityId: 1,
+                                },
+                                filter: {
+                                    filter,
+                                }
+                            }, {});
+                            const getModiEntity = (modies) => {
+                                if (modies[0]) {
+                                    const { entity, entityId } = modies[0];
+                                    entityFilters.push({
+                                        entity: entity,
+                                        filter: {
+                                            id: entityId,
+                                        },
+                                        actions: ['update'],
+                                    });
+                                }
+                                return entityFilters;
+                            };
+                            if (modies instanceof Promise) {
+                                return modies.then((modies2) => getModiEntity(modies2));
+                            }
+                            return getModiEntity(modies);
+                        }
+                        return entityFilters;
+                    }
                     const { entity: deducedEntity, entityId: deducedEntityId } = rows[0];
                     if (!deducedEntity || !deducedEntityId) {
                         // 这种情况会出现在前台缓存里
@@ -801,6 +836,7 @@ class RelationAuth {
      */
     findActionAuthsOnNode(node, context) {
         const { entity, filter, action, userRelations } = node;
+        (0, assert_1.default)(filter);
         const deducedEntityFilters2 = this.getDeducedEntityFilters(entity, filter, [action], context);
         /**
          * 搜索判定是否允许自建对象，自建的条件是 path = ''，destEntity === entity

package/lib/store/TriggerExecutor.js

@@ -352,11 +352,11 @@ class TriggerExecutor {
         const trigger = this.triggerNameMap[name];
         (0, assert_1.default)(trigger && trigger.when === 'commit');
         // assert(ids.length > 0);
-        const { fn } = trigger;
+        const { fn, cleanTriggerDataBySelf } = trigger;
         const closeRoot = trigger.asRoot && context.openRootMode();
         try {
             const callback = await fn({ ids }, context, option);
-            if (trigger.strict === 'makeSure' && ids.length) {
+            if (trigger.strict === 'makeSure' && ids.length && !cleanTriggerDataBySelf) {
                 // 这里开root模式，否则还可能有权限问题
                 const closeRoot2 = context.openRootMode();
                 try {
@@ -485,67 +485,10 @@ class TriggerExecutor {
     }
     async checkpoint(timestamp) {
         let result = 0;
-        for (const entity of this.volatileEntities) {
-            const filter = {
-                [Entity_1.TriggerUuidAttribute]: {
-                    $exists: true,
-                },
-                [Entity_1.UpdateAtAttribute]: {
-                    $lt: timestamp,
-                }
-            };
-            const context = this.contextBuilder();
-            await context.begin();
-            try {
-                const rows = await context.select(entity, {
-                    data: {
-                        id: 1,
-                    },
-                    filter,
-                }, {
-                    includedDeleted: true,
-                    dontCollect: true,
-                });
-                if (rows.length > 0) {
-                    // 要用id来再锁一次，不然会锁住filter的范围，影响并发性
-                    // by Xc 20240314，在haina-busi和haina-cn数据sync过程中发现这个问题
-                    const rows2 = await context.select(entity, {
-                        data: {
-                            id: 1,
-                            [Entity_1.TriggerDataAttribute]: 1,
-                            [Entity_1.TriggerUuidAttribute]: 1,
-                        },
-                        filter: {
-                            id: {
-                                $in: rows.map(ele => ele.id),
-                            },
-                        },
-                    }, {
-                        includedDeleted: true,
-                        dontCollect: true,
-                        forUpdate: 'skip locked', // 如果加不上锁就下次再处理，或者有可能应用自己在处理
-                    });
-                    const grouped = (0, lodash_1.groupBy)(rows2, Entity_1.TriggerUuidAttribute);
-                    for (const uuid in grouped) {
-                        const rs = grouped[uuid];
-                        const { [Entity_1.TriggerDataAttribute]: triggerData } = rs[0];
-                        const { name, cxtStr, option } = triggerData;
-                        await context.initialize(JSON.parse(cxtStr), true);
-                        await this.execVolatileTrigger(entity, name, rs.map(ele => ele.id), context, option);
-                    }
-                }
-                await context.commit();
-                result += rows.length;
-            }
-            catch (err) {
-                if (!(err instanceof types_1.OakPartialSuccess)) {
-                    await context.rollback();
-                    this.logger.error(`error in checkpoint on entity 「${entity}」`, err);
-                }
-                else {
-                    await context.commit();
-                    this.logger.error(`error in checkpoint on entity 「${entity}」`, err);
-                }
+        for (const name in this.triggerNameMap) {
+            const trigger = this.triggerNameMap[name];
+            if (trigger && trigger.when === 'commit') {
+                result += await this.independentCheckPoint(name, timestamp);
             }
         }
         return result;

package/lib/types/Entity.d.ts

@@ -25,7 +25,6 @@ type FilterPart<A extends string, F extends Object | undefined> = {
 export type SelectOption = {
     dontCollect?: boolean;
     blockTrigger?: true;
-    obscure?: boolean;
     forUpdate?: true | 'skip locked' | 'nowait';
     includedDeleted?: true;
     ignoreAttrMiss?: true;

package/lib/types/Expression.d.ts

@@ -150,7 +150,7 @@ export declare function isStringExpression<A>(expression: any): expression is St
 export declare function isAggrExpression<A>(expression: any): expression is AggrExpression<A>;
 export declare function isExpression<A>(expression: any): expression is Expression<A>;
 export declare function opMultipleParams(op: string): boolean;
-export declare function execOp(op: string, params: any, obscure?: boolean): ExpressionConstant;
+export declare function execOp(op: string, params: any): ExpressionConstant;
 /**
  * 检查一个表达式，并分析其涉及到的属性
  * @param expression

package/lib/types/Expression.js

@@ -136,10 +136,7 @@ function opMultipleParams(op) {
         '$round', '$floor', '$ceil', '$$max', '$$min', '$$sum', '$$avg', '$$count'].includes(op);
 }
 exports.opMultipleParams = opMultipleParams;
-function execOp(op, params, obscure) {
-    if (obscure && (params === undefined || params.includes(undefined))) {
-        return true;
-    }
+function execOp(op, params) {
     switch (op) {
         case '$gt': {
             return params[0] > params[1];

package/lib/types/Trigger.d.ts

@@ -40,6 +40,7 @@ interface TriggerCrossTxn<ED extends EntityDict & BaseEntityDict, Cxt extends As
     when: 'commit';
     strict?: 'takeEasy' | 'makeSure';
     cs?: true;
+    cleanTriggerDataBySelf?: true;
     singleton?: true;
     grouped?: true;
     fn: (event: {

package/lib/utils/SimpleConnector.js

@@ -78,8 +78,7 @@ class SimpleConnector {
     ;
     async parseAspectResult(response) {
         if (response.status > 299) {
-            const err = new types_1.OakServerProxyException(`网络请求返回status是${response.status}`);
-            throw this.makeException(err);
+            throw new types_1.OakServerProxyException(`网络请求返回status是${response.status}`);
         }
         const message = response.headers.get('oak-message');
         const responseType = response.headers.get('Content-Type') ||
@@ -120,14 +119,10 @@ class SimpleConnector {
         }
         catch (err) {
             // fetch返回异常一定是网络异常
-            let exception = err;
             if (err instanceof types_1.OakRequestTimeoutException) {
-                exception = new types_1.OakNetworkException(`接口请求超时`);
+                throw new types_1.OakNetworkException(`接口请求超时`);
             }
-            else {
-                exception = new types_1.OakNetworkException(`接口请求时发生网络异常`);
-            }
-            throw this.makeException(exception);
+            throw new types_1.OakNetworkException(`接口请求时发生网络异常`);
         }
         return this.parseAspectResult(response);
     }
@@ -149,18 +144,13 @@ class SimpleConnector {
             response = await this.fetchWithTimeout(this.serverSubscribePointUrl, {}, this.timeout);
         }
         catch (err) {
-            let exception = err;
             if (err instanceof types_1.OakRequestTimeoutException) {
-                exception = new types_1.OakNetworkException(`接口请求超时`);
-            }
-            else {
-                exception = new types_1.OakNetworkException(`接口请求时发生网络异常`);
+                throw new types_1.OakNetworkException(`接口请求超时`);
             }
-            throw this.makeException(exception);
+            throw new types_1.OakNetworkException(`接口请求时发生网络异常`);
         }
         if (response.status > 299) {
-            const err = new types_1.OakServerProxyException(`网络请求返回status是${response.status}`);
-            throw this.makeException(err);
+            throw new types_1.OakServerProxyException(`网络请求返回status是${response.status}`);
         }
         const message = response.headers.get('oak-message');
         const responseType = response.headers.get('Content-Type') ||
@@ -246,28 +236,29 @@ class SimpleConnector {
         return {};
     }
     async fetchWithTimeout(url, options, timeout = 5000) {
-        if (typeof AbortController === 'undefined') {
-            return global.fetch(url, options);
-        }
-        const controller = new AbortController();
-        const signal = controller.signal;
-        // 设置超时
-        const timeoutId = setTimeout(() => {
-            controller.abort();
-        }, timeout);
-        // 发起 fetch 请求并传递 signal
-        return global.fetch(url, Object.assign({}, options, { signal }))
-            .then(response => {
-            clearTimeout(timeoutId); // 如果请求成功，清除超时
-            return response;
-        })
-            .catch(error => {
-            clearTimeout(timeoutId); // 如果请求失败，清除超时
-            if (error.name === 'AbortError') {
-                throw new types_1.OakRequestTimeoutException();
-            }
-            throw error; // 其他错误
-        });
+        return global.fetch(url, options);
+        // if (typeof AbortController === 'undefined' || timeout === 0) {
+        //     return global.fetch(url, options);
+        // }
+        // const controller = new AbortController();
+        // const signal = controller.signal;
+        // // 设置超时
+        // const timeoutId = setTimeout(() => {
+        //   controller.abort();
+        // }, timeout);
+        // // 发起 fetch 请求并传递 signal
+        // return global.fetch(url, Object.assign({}, options, { signal }))
+        //   .then(response => {
+        //     clearTimeout(timeoutId); // 如果请求成功，清除超时
+        //     return response;
+        //   })
+        //   .catch(error => {
+        //     clearTimeout(timeoutId); // 如果请求失败，清除超时
+        //     if (error.name === 'AbortError') {
+        //       throw new OakRequestTimeoutException();
+        //     }
+        //     throw error; // 其他错误
+        //   });
     }
 }
 exports.default = SimpleConnector;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "5.1.13",
+    "version": "5.1.15",
     "author": {
         "name": "XuChang"
     },