oak-domain 5.0.18 → 5.0.19

package/lib/compiler/routerBuilder.js

@@ -100,8 +100,9 @@ function makeWebAllRouters(namespaceDir, projectDir, routerFileDir) {
         const nsIndexJsonFile = (0, path_1.join)(namespaceDir, ns, 'index.json');
         let path2 = `/${ns}`;
         let notFound2 = '', first2 = '';
+        let params2 = {};
         if ((0, fs_extra_1.existsSync)(nsIndexJsonFile)) {
-            const { path, notFound, first } = require(nsIndexJsonFile);
+            const { path, notFound, first, params } = require(nsIndexJsonFile);
             if (path) {
                 path2 = path.replace(/\\/g, '/');
             }
@@ -114,11 +115,19 @@ function makeWebAllRouters(namespaceDir, projectDir, routerFileDir) {
                     first2 = first2.slice(1);
                 }
             }
+            if (params) {
+                params2 = params;
+            }
         }
         let firstPage;
         const children = Object.values(pages).filter((ele) => ele.hasWeb).map(({ path, oakDisablePulldownRefresh }) => {
+            let path2 = path;
+            if (params2[path]) {
+                // 如果有参数，接在path后面
+                path2 += `/:${params2[path]}`;
+            }
             const properties = [
-                factory.createPropertyAssignment('path', factory.createStringLiteral(path)),
+                factory.createPropertyAssignment('path', factory.createStringLiteral(path2)),
                 factory.createPropertyAssignment('namespace', factory.createStringLiteral(ns)),
                 factory.createPropertyAssignment('meta', factory.createObjectLiteralExpression([
                     factory.createPropertyAssignment('oakDisablePulldownRefresh', oakDisablePulldownRefresh ? factory.createTrue() : factory.createFalse())

package/lib/store/TriggerExecutor.d.ts

@@ -39,4 +39,12 @@ export declare class TriggerExecutor<ED extends EntityDict & BaseEntityDict, Cxt
         action: 'select';
     }, context: Cxt, option: OperateOption | SelectOption, result?: Partial<ED[T]['Schema']>[]): Promise<void> | void;
     checkpoint(timestamp: number): Promise<number>;
+    /**
+     * 由外部来控制进行按volatileTrigger逐个进行checkpoint
+     * @param name
+     * @param timestamp
+     * @param instanceCount
+     * @param instanceId
+     */
+    independentCheckPoint(name: string, timestamp: number, instanceCount?: number, instanceId?: number): Promise<number>;
 }

package/lib/store/TriggerExecutor.js

@@ -49,8 +49,12 @@ class TriggerExecutor {
                 await context.commit();
             }
             catch (err) {
-                await context.rollback();
-                if (!(err instanceof types_1.OakMakeSureByMySelfException)) {
+                if (!(err instanceof types_1.OakPartialSuccess)) {
+                    await context.rollback();
+                    this.logger.error('error on volatile trigger', entity, trigger.name, ids.join(','), err);
+                }
+                else {
+                    await context.commit();
                     this.logger.error('error on volatile trigger', entity, trigger.name, ids.join(','), err);
                 }
                 // throw err;
@@ -363,6 +367,12 @@ class TriggerExecutor {
                         filter: {
                             id: {
                                 $in: ids,
+                            },
+                            [Entity_1.TriggerDataAttribute]: {
+                                $exists: true,
+                            },
+                            [Entity_1.TriggerUuidAttribute]: {
+                                $exists: true,
                             }
                         }
                     }, { includedDeleted: true, blockTrigger: true });
@@ -473,10 +483,6 @@ class TriggerExecutor {
     async checkpoint(timestamp) {
         let result = 0;
         for (const entity of this.volatileEntities) {
-            if (entity === 'oper') {
-                // oper上的跨事务同步是系统synchronizer统一处理
-                continue;
-            }
             const filter = {
                 [Entity_1.TriggerUuidAttribute]: {
                     $exists: true,
@@ -486,12 +492,6 @@ class TriggerExecutor {
                 }
             };
             const context = this.contextBuilder();
-            if (context.clusterInfo?.usingCluster) {
-                const { instanceCount, instanceId } = context.clusterInfo;
-                filter.$$seq$$ = {
-                    $mod: [instanceCount, instanceId],
-                };
-            }
             await context.begin();
             try {
                 const rows = await context.select(entity, {
@@ -532,15 +532,108 @@ class TriggerExecutor {
                     }
                 }
                 await context.commit();
+                result += rows.length;
             }
             catch (err) {
-                await context.rollback();
-                if (!(err instanceof types_1.OakMakeSureByMySelfException)) {
-                    this.logger.error(`执行checkpoint时出错，对象是「${entity}」，异常是`, 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);
                 }
             }
         }
         return result;
     }
+    /**
+     * 由外部来控制进行按volatileTrigger逐个进行checkpoint
+     * @param name
+     * @param timestamp
+     * @param instanceCount
+     * @param instanceId
+     */
+    async independentCheckPoint(name, timestamp, instanceCount, instanceId) {
+        const trigger = this.triggerNameMap[name];
+        (0, assert_1.default)(trigger && trigger.when === 'commit');
+        const { fn, entity, grouped } = trigger;
+        const filter = {
+            [Entity_1.TriggerDataAttribute]: {
+                name,
+            },
+            [Entity_1.TriggerUuidAttribute]: {
+                $exists: true,
+            },
+            [Entity_1.UpdateAtAttribute]: {
+                $lt: timestamp,
+            },
+        };
+        if (instanceCount) {
+            filter.$$seq$$ = {
+                $mod: [instanceCount, instanceId]
+            };
+        }
+        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', // 如果加不上锁就下次再处理，或者有可能应用自己在处理
+                });
+                if (grouped) {
+                    // grouped不需要上下文了吧，内部一定会用root
+                    await this.execVolatileTrigger(entity, name, rows.map(ele => ele.id), context, {});
+                }
+                else {
+                    const groupedRowDict = (0, lodash_1.groupBy)(rows2, Entity_1.TriggerUuidAttribute);
+                    for (const uuid in groupedRowDict) {
+                        const rs = groupedRowDict[uuid];
+                        const { [Entity_1.TriggerDataAttribute]: triggerData } = rs[0];
+                        const { 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();
+            return rows.length;
+        }
+        catch (err) {
+            if (!(err instanceof types_1.OakPartialSuccess)) {
+                await context.rollback();
+                this.logger.error('error on volatile trigger', entity, trigger.name, err);
+            }
+            else {
+                await context.commit();
+                this.logger.error('error on volatile trigger', entity, trigger.name, err);
+            }
+            return 0;
+        }
+    }
 }
 exports.TriggerExecutor = TriggerExecutor;

package/lib/types/Exception.d.ts

@@ -19,7 +19,7 @@ export declare class OakException<ED extends EntityDict & BaseEntityDict> extend
     tag2?: boolean;
     tag3?: any;
 }
-export declare class OakMakeSureByMySelfException<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
+export declare class OakPartialSuccess<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
 }
 export declare class OakDataException<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
 }

package/lib/types/Exception.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeException = exports.OakExternalException = exports.OakPreConditionUnsetException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserInvisibleException = exports.OakUserUnpermittedException = exports.OakAttrCantUpdateException = exports.OakAttrNotNullException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakServerProxyException = exports.OakNetworkException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakUserException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakNoRelationDefException = exports.OakDataException = exports.OakMakeSureByMySelfException = exports.OakException = void 0;
+exports.makeException = exports.OakExternalException = exports.OakPreConditionUnsetException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserInvisibleException = exports.OakUserUnpermittedException = exports.OakAttrCantUpdateException = exports.OakAttrNotNullException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakServerProxyException = exports.OakNetworkException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakUserException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakNoRelationDefException = exports.OakDataException = exports.OakPartialSuccess = exports.OakException = void 0;
 const relation_1 = require("../store/relation");
 const lodash_1 = require("../utils/lodash");
 class OakException extends Error {
@@ -90,10 +90,10 @@ class OakException extends Error {
     tag3;
 }
 exports.OakException = OakException;
-// 这个异常表示模块自己处理跨事务一致性，框架pass（在分布式数据传递时会用到）
-class OakMakeSureByMySelfException extends OakException {
+// 这个异常表示事务虽然没有完全成功，但是仍然应该提交并抛出异常（在分布式数据传递时会用到）
+class OakPartialSuccess extends OakException {
 }
-exports.OakMakeSureByMySelfException = OakMakeSureByMySelfException;
+exports.OakPartialSuccess = OakPartialSuccess;
 class OakDataException extends OakException {
 }
 exports.OakDataException = OakDataException;

package/lib/types/Timer.d.ts

@@ -12,6 +12,7 @@ export type FreeTimer<ED extends EntityDict, Cxt extends AsyncContext<ED>> = {
     name: string;
     cron: RecurrenceRule | RecurrenceSpecDateRange | RecurrenceSpecObjLit | Date | string | number;
     timer: FreeOperateFn<ED, Cxt>;
+    singleton?: true;
 };
 export type Routine<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>> = FreeRoutine<ED, Cxt> | Watcher<ED, T, Cxt>;
 export type Timer<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>> = FreeTimer<ED, Cxt> | Watcher<ED, T, Cxt> & {

package/lib/types/Trigger.d.ts

@@ -39,6 +39,8 @@ interface TriggerCrossTxn<ED extends EntityDict, Cxt extends AsyncContext<ED> |
     when: 'commit';
     strict?: 'takeEasy' | 'makeSure';
     cs?: true;
+    singleton?: true;
+    grouped?: true;
     fn: (event: {
         ids: string[];
     }, context: Cxt, option: OperateOption) => Promise<((context: Cxt, option: OperateOption) => Promise<any>) | void>;

package/lib/types/Watcher.d.ts

@@ -8,6 +8,7 @@ export interface BBWatcher<ED extends EntityDict, T extends keyof ED> {
     filter: ED[T]['Selection']['filter'] | (() => ED[T]['Selection']['filter']);
     action: Omit<ED[T]['Action'], 'create' | ReadOnlyAction>;
     actionData: ActionData<ED, T> | (() => Promise<ActionData<ED, T>>);
+    singleton?: true;
 }
 export interface WBWatcher<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>> {
     name: string;
@@ -15,6 +16,7 @@ export interface WBWatcher<ED extends EntityDict, T extends keyof ED, Cxt extend
     filter: ED[T]['Selection']['filter'] | (() => Promise<ED[T]['Selection']['filter']>);
     projection: ED[T]['Selection']['data'] | (() => Promise<ED[T]['Selection']['data']>);
     fn: (context: Cxt, data: Partial<ED[T]['Schema']>[]) => Promise<OperationResult<ED>>;
+    singleton?: true;
 }
 export type Watcher<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>> = BBWatcher<ED, T> | WBWatcher<ED, T, Cxt>;
 export {};

package/package.json

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

package/src/entities/ModiEntity.ts

@@ -1,26 +1,26 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { Schema as Modi } from './Modi';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    modi: Modi,
-    entity: String<32>;
-    entityId: String<64>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '更新对象连接',
-            attr: {
-                modi: '更新',
-                entity: '关联对象',
-                entityId: '关联对象id',
-            },
-        },
-    },
-    configuration: {
-        actionType: 'appendOnly',
-    }
-};
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { Schema as Modi } from './Modi';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    modi: Modi,
+    entity: String<32>;
+    entityId: String<64>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '更新对象连接',
+            attr: {
+                modi: '更新',
+                entity: '关联对象',
+                entityId: '关联对象id',
+            },
+        },
+    },
+    configuration: {
+        actionType: 'appendOnly',
+    }
+};

package/src/entities/OperEntity.ts

@@ -1,27 +1,27 @@
-import { String } from '../types/DataType';
-import { EntityShape, Configuration } from '../types/Entity';
-import { LocaleDef } from '../types/Locale';
-import { Schema as Oper } from './Oper';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    oper: Oper,
-    entity: String<32>;
-    entityId: String<64>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '操作对象连接',
-            attr: {
-                oper: '操作',
-                entity: '关联对象',
-                entityId: '关联对象id',
-            },
-        },
-    },
-    configuration: {
-        actionType: 'appendOnly',
-    }
-};
+import { String } from '../types/DataType';
+import { EntityShape, Configuration } from '../types/Entity';
+import { LocaleDef } from '../types/Locale';
+import { Schema as Oper } from './Oper';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    oper: Oper,
+    entity: String<32>;
+    entityId: String<64>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '操作对象连接',
+            attr: {
+                oper: '操作',
+                entity: '关联对象',
+                entityId: '关联对象id',
+            },
+        },
+    },
+    configuration: {
+        actionType: 'appendOnly',
+    }
+};

package/src/entities/Relation.ts

@@ -1,43 +1,43 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    entity: String<32>;
-    entityId?: String<64>;        // 可以为空
-    name?: String<32>;
-    display?: String<32>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '用户授权',
-            attr: {
-                name: '关系',
-                entity: '目标对象',
-                entityId: '目标对象id',
-                display: '显示值',
-            },
-        },
-    },
-    indexes: [
-        {
-            name: 'index_targetEntity_entityId_name',
-            attributes: [
-                {
-                    name: 'entity',
-                },
-                {
-                    name: 'entityId',
-                },
-                {
-                    name: 'name',
-                }
-            ],
-            config: {
-                unique: true,
-            },
-        },
-    ]
-};
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    entity: String<32>;
+    entityId?: String<64>;        // 可以为空
+    name?: String<32>;
+    display?: String<32>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '用户授权',
+            attr: {
+                name: '关系',
+                entity: '目标对象',
+                entityId: '目标对象id',
+                display: '显示值',
+            },
+        },
+    },
+    indexes: [
+        {
+            name: 'index_targetEntity_entityId_name',
+            attributes: [
+                {
+                    name: 'entity',
+                },
+                {
+                    name: 'entityId',
+                },
+                {
+                    name: 'name',
+                }
+            ],
+            config: {
+                unique: true,
+            },
+        },
+    ]
+};

package/src/entities/UserEntityClaim.ts

@@ -1,30 +1,30 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { EntityDesc } from '../types/EntityDesc';
-import { Schema as UserEntityGrant } from './UserEntityGrant';
-import { Schema as User } from './User';
-import { Schema as Relation } from './Relation';
-import { Schema as UserRelation } from './UserRelation';
-
-export interface Schema extends EntityShape {
-    ueg: UserEntityGrant;
-    user: User;
-    relation: Relation;
-    claimEntityId: String<64>;
-    userRelation: UserRelation;
-};
-
-const entityDesc: EntityDesc<Schema, ''> = {
-    locales: {
-        zh_CN: {
-            name: '用户授权领取',
-            attr: {
-                ueg: '授权',
-                user: '用户',
-                relation: '关系',
-                claimEntityId: '对象Id',
-                userRelation: '用户关系',
-            },
-        },
-    },
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { EntityDesc } from '../types/EntityDesc';
+import { Schema as UserEntityGrant } from './UserEntityGrant';
+import { Schema as User } from './User';
+import { Schema as Relation } from './Relation';
+import { Schema as UserRelation } from './UserRelation';
+
+export interface Schema extends EntityShape {
+    ueg: UserEntityGrant;
+    user: User;
+    relation: Relation;
+    claimEntityId: String<64>;
+    userRelation: UserRelation;
+};
+
+const entityDesc: EntityDesc<Schema, ''> = {
+    locales: {
+        zh_CN: {
+            name: '用户授权领取',
+            attr: {
+                ueg: '授权',
+                user: '用户',
+                relation: '关系',
+                claimEntityId: '对象Id',
+                userRelation: '用户关系',
+            },
+        },
+    },
 };

package/src/entities/UserEntityGrant.ts

@@ -1,24 +1,24 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { EntityDesc } from '../types/EntityDesc';
-
-type RelationIds = string[];
-
-export interface Schema extends EntityShape {
-    relationEntity: String<32>;
-    relationEntityFilter: Object;
-    relationIds: RelationIds;
-};
-
-const entityDesc: EntityDesc<Schema, ''> = {
-    locales: {
-        zh_CN: {
-            name: '用户授权',
-            attr: {
-                relationIds: '关系',
-                relationEntity: '关联对象',
-                relationEntityFilter: '对象限定条件',
-            },
-        },
-    },
-};
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { EntityDesc } from '../types/EntityDesc';
+
+type RelationIds = string[];
+
+export interface Schema extends EntityShape {
+    relationEntity: String<32>;
+    relationEntityFilter: Object;
+    relationIds: RelationIds;
+};
+
+const entityDesc: EntityDesc<Schema, ''> = {
+    locales: {
+        zh_CN: {
+            name: '用户授权',
+            attr: {
+                relationIds: '关系',
+                relationEntity: '关联对象',
+                relationEntityFilter: '对象限定条件',
+            },
+        },
+    },
+};

package/src/entities/UserRelation.ts

@@ -1,50 +1,50 @@
-import { String } from '../types/DataType';
-import { LocaleDef } from '../types/Locale';
-import { EntityShape } from '../types/Entity';
-import { Index } from '../types/Storage';
-import { Schema as User } from './User';
-import { Schema as Relation } from './Relation';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    user: User;
-    relation: Relation;
-    entity: String<32>;
-    entityId: String<64>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '用户对象关系',
-            attr: {
-                user: '关系',
-                relation: '目标关系',
-                entity: '目标对象',
-                entityId: '目标对象ID',
-            },
-        },
-    },
-    indexes: [
-        {
-            name: 'index_user_entity_entityId_relation',
-            attributes: [
-                {
-                    name: 'user',
-                },
-                {
-                    name: 'entity',
-                },
-                {
-                    name: 'entityId',
-                },
-                {
-                    name: 'relation',
-                },
-            ],
-            config: {
-                unique: true,
-            },
-        },
-    ]
-};
+import { String } from '../types/DataType';
+import { LocaleDef } from '../types/Locale';
+import { EntityShape } from '../types/Entity';
+import { Index } from '../types/Storage';
+import { Schema as User } from './User';
+import { Schema as Relation } from './Relation';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    user: User;
+    relation: Relation;
+    entity: String<32>;
+    entityId: String<64>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '用户对象关系',
+            attr: {
+                user: '关系',
+                relation: '目标关系',
+                entity: '目标对象',
+                entityId: '目标对象ID',
+            },
+        },
+    },
+    indexes: [
+        {
+            name: 'index_user_entity_entityId_relation',
+            attributes: [
+                {
+                    name: 'user',
+                },
+                {
+                    name: 'entity',
+                },
+                {
+                    name: 'entityId',
+                },
+                {
+                    name: 'relation',
+                },
+            ],
+            config: {
+                unique: true,
+            },
+        },
+    ]
+};