oak-backend-base 4.1.0 → 4.1.2

package/lib/AppLoader.d.ts

@@ -31,7 +31,7 @@ export declare class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt exten
         result: any;
         message?: string;
     }>;
-    initialize(truncate?: boolean): Promise<void>;
+    initialize(): Promise<void>;
     getStore(): DbStore<ED, Cxt>;
     getEndpoints(prefix: string): [string, "post" | "get" | "put" | "delete", string, (params: Record<string, string>, headers: IncomingHttpHeaders, req: IncomingMessage, body?: any) => Promise<any>][];
     protected operateInWatcher<T extends keyof ED>(entity: T, operation: ED[T]['Update'], context: Cxt): Promise<OperationResult<ED>>;

package/lib/AppLoader.js

@@ -11,7 +11,6 @@ const uuid_1 = require("oak-domain/lib/utils/uuid");
 const types_1 = require("oak-domain/lib/types");
 const DbStore_1 = require("./DbStore");
 const index_1 = tslib_1.__importStar(require("oak-common-aspect/lib/index"));
-const assert_1 = tslib_1.__importDefault(require("assert"));
 const dependencyBuilder_1 = require("oak-domain/lib/compiler/dependencyBuilder");
 const DataSubscriber_1 = tslib_1.__importDefault(require("./cluster/DataSubscriber"));
 const env_1 = require("./cluster/env");
@@ -94,7 +93,9 @@ class AppLoader extends types_1.AppLoader {
                     Object.keys(eventOperationMap).forEach((event) => {
                         const ids = eventOperationMap[event];
                         const opRecordsToPublish = opRecords.filter((ele) => !!ele.id && ids.includes(ele.id));
-                        (0, assert_1.default)(opRecordsToPublish.length === ids.length, '要推送的事件的operation数量不足，请检查确保');
+                        if (opRecordsToPublish.length !== ids.length && process.env.NODE_ENV === 'development') {
+                            console.warn('要推送的事件的operation数量不足event事件中记录的数据，请检查是否有空operation被加入了推送事件');
+                        }
                         loaderThis.dataSubscriber.publishEvent(event, opRecordsToPublish, this.getSubscriberId());
                     });
                 }
@@ -163,28 +164,49 @@ class AppLoader extends types_1.AppLoader {
             throw err;
         }
     }
-    async initialize(truncate) {
+    async initialize() {
         await this.dbStore.initialize({ ifExists: 'dropIfNotStatic' });
         const data = this.requireSth('lib/data/index');
         const context = this.contextBuilder(this.dbStore);
+        context.openRootMode();
         for (const entity in data) {
             let rows = data[entity];
-            if (entity === 'area') {
-                //  对area暂时处理一下
-                rows = require('./data/area.json');
-            }
-            if (rows.length > 0 && (!truncate || !this.dbStore.getSchema()[entity].static)) {
+            if (rows.length > 0) {
                 await context.begin();
-                context.openRootMode();
+                // 如果是static的对象，只要表中有数据就pass
+                const [first] = await this.dbStore.select(entity, {
+                    data: {
+                        id: 1,
+                    },
+                    indexFrom: 0,
+                    count: 1,
+                }, context, {});
+                if (this.dbStore.getSchema()[entity].static) {
+                    if (first) {
+                        await context.commit();
+                        console.log(`data in ${entity} omitted, ${rows.length} rows passed`);
+                        continue;
+                    }
+                }
+                // 再插入所有的行
                 try {
-                    await this.dbStore.operate(entity, {
-                        data: rows,
-                        action: 'create',
-                    }, context, {
-                        dontCollect: true,
-                        dontCreateOper: true,
-                        blockTrigger: true,
-                    });
+                    const insertRows = async (idx) => {
+                        const rows2 = rows.slice(idx, 1000);
+                        if (rows2.length > 0) {
+                            await this.dbStore.operate(entity, {
+                                data: rows,
+                                action: 'create',
+                            }, context, {
+                                dontCollect: true,
+                                dontCreateOper: true,
+                                blockTrigger: true,
+                            });
+                            if (rows2.length === 1000) {
+                                await insertRows(idx + 1000);
+                            }
+                        }
+                    };
+                    await insertRows(0);
                     await context.commit();
                     console.log(`data in ${entity} initialized, ${rows.length} rows inserted`);
                 }
@@ -249,14 +271,12 @@ class AppLoader extends types_1.AppLoader {
         return endPointRouters;
     }
     operateInWatcher(entity, operation, context) {
-        return this.dbStore.operate(entity, operation, context, {
-            dontCollect: true,
-        });
+        return this.dbStore.operate(entity, operation, context, {});
     }
     selectInWatcher(entity, selection, context) {
         return this.dbStore.select(entity, selection, context, {
-            dontCollect: true,
             blockTrigger: true,
+            forUpdate: true,
         });
     }
     async execWatcher(watcher) {
@@ -265,19 +285,19 @@ class AppLoader extends types_1.AppLoader {
         try {
             if (watcher.hasOwnProperty('actionData')) {
                 const { entity, action, filter, actionData } = watcher;
-                const filter2 = typeof filter === 'function' ? await filter() : filter;
-                const data = typeof actionData === 'function' ? await (actionData)() : actionData;
+                const filter2 = typeof filter === 'function' ? await filter() : (0, lodash_1.cloneDeep)(filter);
+                const data = typeof actionData === 'function' ? await (actionData)() : (0, lodash_1.cloneDeep)(actionData);
                 result = await this.operateInWatcher(entity, {
                     id: await (0, uuid_1.generateNewIdAsync)(),
-                    action,
+                    action: action,
                     data,
                     filter: filter2
                 }, context);
             }
             else {
                 const { entity, projection, fn, filter } = watcher;
-                const filter2 = typeof filter === 'function' ? await filter() : filter;
-                const projection2 = typeof projection === 'function' ? await projection() : projection;
+                const filter2 = typeof filter === 'function' ? await filter() : (0, lodash_1.cloneDeep)(filter);
+                const projection2 = typeof projection === 'function' ? await projection() : (0, lodash_1.cloneDeep)(projection);
                 const rows = await this.selectInWatcher(entity, {
                     data: projection2,
                     filter: filter2,

package/lib/Synchronizer.js

@@ -102,12 +102,24 @@ class Synchronizer {
         }
         if (successIds.length > 0) {
             try {
-                await Promise.all(successIds.map((id) => {
+                await Promise.all(successIds.map(async (id) => {
                     const { onSynchronized, oper } = queue.find(ele => ele.oper.id === id);
+                    const operEntityArr = await context.select('operEntity', {
+                        data: {
+                            id: 1,
+                            entity: 1,
+                            entityId: 1
+                        },
+                        filter: {
+                            operId: oper.id,
+                        }
+                    }, {});
+                    const entityIds = operEntityArr.map(ele => ele.entityId);
                     return onSynchronized && onSynchronized({
                         action: oper.action,
                         data: oper.data,
-                        rowIds: (0, filter_1.getRelevantIds)(oper.filter),
+                        // rowIds: getRelevantIds(oper.filter!),
+                        rowIds: entityIds
                     }, context);
                 }));
             }
@@ -184,9 +196,10 @@ class Synchronizer {
         };
     }
     async dispatchOperToChannels(oper, context) {
-        const { operatorId, targetEntity, filter, action, data } = oper;
-        const entityIds = (0, filter_1.getRelevantIds)(filter);
-        (0, assert_1.default)(entityIds.length > 0);
+        const { operatorId, targetEntity, filter, action, data, operEntity$oper } = oper;
+        const entityIds = operEntity$oper?.map(ele => ele.entityId);
+        // const entityIds = getRelevantIds(filter!);
+        (0, assert_1.default)(entityIds && entityIds.length > 0);
         const pushEntityNodes = this.pushAccessMap[targetEntity];
         let pushed = false;
         if (pushEntityNodes && pushEntityNodes.length > 0) {
@@ -229,7 +242,7 @@ class Synchronizer {
                         this.pushOperToChannel(oper2, userId, url, endpoint, entity, entityId, selfEncryptInfo, onSynchronized);
                     };
                     for (const userId in userSendDict) {
-                        if (userId !== operatorId || oper.bornAt) {
+                        if (userId !== operatorId || !oper.bornAt) {
                             await pushToUserIdFn(userId);
                             pushed = true;
                         }
@@ -277,6 +290,15 @@ class Synchronizer {
                         $$createAt$$: 1,
                         $$seq$$: 1,
                         filter: 1,
+                        operEntity$oper: {
+                            $entity: 'operEntity',
+                            data: {
+                                entityId: 1,
+                                operId: 1,
+                                entity: 1,
+                                id: 1,
+                            }
+                        }
                     },
                     filter: {
                         id: { $in: ids },
@@ -504,7 +526,7 @@ class Synchronizer {
                 // todo 解密
                 const opers = body;
                 const ids = opers.map(ele => ele.id);
-                const existeIds = (await context.select('oper', {
+                const existsIds = (await context.select('oper', {
                     data: {
                         id: 1,
                     },
@@ -514,8 +536,8 @@ class Synchronizer {
                         },
                     }
                 }, {})).map(ele => ele.id);
-                const staleOpers = opers.filter(ele => existeIds.includes(ele.id));
-                const freshOpers = opers.filter(ele => !existeIds.includes(ele.id));
+                const staleOpers = opers.filter((ele) => existsIds.includes(ele.id));
+                const freshOpers = opers.filter((ele) => !existsIds.includes(ele.id));
                 if (process.env.NODE_ENV !== 'production') {
                     const maxStaleSeq = Math.max(...staleOpers.map(ele => ele.$$seq$$));
                     for (const oper of freshOpers) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-backend-base",
-    "version": "4.1.0",
+    "version": "4.1.2",
     "description": "oak-backend-base",
     "main": "lib/index",
     "author": {
@@ -22,8 +22,8 @@
         "node-schedule": "^2.1.0",
         "oak-common-aspect": "~3.0.0",
         "oak-db": "~3.3.0",
-        "oak-domain": "~5.0.8",
-        "oak-frontend-base": "~5.1.0",
+        "oak-domain": "~5.0.16",
+        "oak-frontend-base": "~5.3.0",
         "socket.io": "^4.7.2",
         "socket.io-client": "^4.7.2",
         "uuid": "^8.3.2"