oak-domain 5.1.14 → 5.1.15

package/lib/store/CascadeStore.js

@@ -1405,16 +1405,24 @@ class CascadeStore extends RowStore_1.RowStore {
                         },
                     };
                 };
-                if (option.modiParentEntity && !['modi', 'modiEntity'].includes(entity)) {
-                    // 延时更新，变成对modi的操作
-                    if (action === 'update' && Object.keys(data).length === 0) {
-                        return {};
+                const saveRecordAndCreateOper = async () => {
+                    if (action === 'remove') {
+                        if (!option.dontCollect) {
+                            context.saveOpRecord(entity, {
+                                id: operId,
+                                action,
+                                data: data,
+                                filter: {
+                                    id: {
+                                        $in: ids,
+                                    }
+                                },
+                            });
+                        }
                     }
-                    return createModi();
-                }
-                else {
-                    const saveRecordAndCreateOper = async () => {
-                        if (action === 'remove') {
+                    else {
+                        const updateAttrCount = Object.keys(data).length;
+                        if (updateAttrCount > 0) {
                             if (!option.dontCollect) {
                                 context.saveOpRecord(entity, {
                                     id: operId,
@@ -1428,68 +1436,61 @@ class CascadeStore extends RowStore_1.RowStore {
                                 });
                             }
                         }
-                        else {
-                            const updateAttrCount = Object.keys(data).length;
-                            if (updateAttrCount > 0) {
-                                if (!option.dontCollect) {
-                                    context.saveOpRecord(entity, {
-                                        id: operId,
-                                        action,
-                                        data: data,
-                                        filter: {
-                                            id: {
-                                                $in: ids,
-                                            }
-                                        },
-                                    });
-                                }
-                            }
-                            else {
-                                return {};
-                            }
-                        }
-                        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,
+                    }
+                    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,
+                                    })))
                                 },
-                            };
-                            const closeRootMode = context.openRootMode();
-                            await this.cascadeUpdateAsync('oper', createOper, context, {
-                                dontCollect: !option.logId, // 如果是在创建log，则把oper收集回去
-                            });
-                            closeRootMode();
-                        }
-                        return {
-                            [entity]: {
-                                [action]: ids.length,
-                            }
+                                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();

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/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') ||

package/package.json

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