oak-backend-base 4.1.5 → 4.1.7

package/lib/ClusterAppLoader.js

@@ -72,7 +72,7 @@ class ClusterAppLoader extends AppLoader_1.AppLoader {
             if (trigger.cs) {
                 // 如果是cluster sensative的触发器，需要发送到相应的instance上被处理
                 const context = await this.makeContext();
-                const rows = await context.select(entity, {
+                const rows = !!(ids.length) ? await context.select(entity, {
                     data: {
                         id: 1,
                         $$seq$$: 1,
@@ -80,7 +80,7 @@ class ClusterAppLoader extends AppLoader_1.AppLoader {
                     filter: {
                         id: { $in: ids },
                     }
-                }, { dontCollect: true });
+                }, { dontCollect: true }) : [];
                 await context.commit();
                 const { instanceCount, instanceId } = (0, env_1.getClusterInfo)();
                 const grouped = (0, lodash_1.groupBy)(rows, (ele) => ele.$$seq$$ % instanceCount);
@@ -101,7 +101,7 @@ class ClusterAppLoader extends AppLoader_1.AppLoader {
                 if ((0, env_1.getClusterInfo)().instanceId === 0) {
                     await execLocal(ids);
                 }
-                else {
+                else if (ids.length) {
                     if (process.env.NODE_ENV === 'development') {
                         console.log(`在trigger「${trigger.name}」上，因为singleton原因，数据「${ids.join(',')}」将被推送到「0」号进程操作（当前进程号是「${(0, env_1.getClusterInfo)().instanceId}」）`);
                     }

package/lib/Synchronizer.js

@@ -10,7 +10,7 @@ const filter_1 = require("oak-domain/lib/store/filter");
 const uuid_1 = require("oak-domain/lib/utils/uuid");
 const lodash_2 = require("lodash");
 const OAK_SYNC_HEADER_ENTITY = 'oak-sync-entity';
-const OAK_SYNC_HEADER_ENTITYID = 'oak-sync-entity-id';
+const OAK_SYNC_HEADER_ENTITY_ID = 'oak-sync-entity-id';
 class Synchronizer {
     config;
     schema;
@@ -36,7 +36,7 @@ class Synchronizer {
                 headers: {
                     'Content-Type': 'application/json',
                     [OAK_SYNC_HEADER_ENTITY]: entity,
-                    [OAK_SYNC_HEADER_ENTITYID]: entityId,
+                    [OAK_SYNC_HEADER_ENTITY_ID]: entityId,
                 },
                 body: JSON.stringify(opers),
             });
@@ -50,17 +50,27 @@ class Synchronizer {
         }
         catch (err) {
             if (onFailed) {
-                await onFailed({
-                    remoteEntity: entity,
-                    remoteEntityId: entityId,
-                    data: queue.map((ele) => ({
-                        entity: ele.oper.targetEntity,
-                        rowIds: ele.oper.filter.id.$in,
-                        action: ele.oper.action,
-                        data: ele.oper.data,
-                    })),
-                    reason: err,
-                }, context);
+                context.on('rollback', async () => {
+                    const context2 = this.contextBuilder();
+                    context2.begin();
+                    try {
+                        await onFailed({
+                            remoteEntity: entity,
+                            remoteEntityId: entityId,
+                            data: queue.map((ele) => ({
+                                entity: ele.oper.targetEntity,
+                                rowIds: ele.oper.filter.id.$in,
+                                action: ele.oper.action,
+                                data: ele.oper.data,
+                            })),
+                            reason: err,
+                        }, context2);
+                        context2.commit();
+                    }
+                    catch (err) {
+                        context2.rollback();
+                    }
+                });
             }
             throw err;
         }
@@ -79,11 +89,12 @@ class Synchronizer {
                     }
                 }, {});
                 const entityIds = operEntityArr.map(ele => ele.entityId);
-                return onSynchronized && onSynchronized({
+                return onSynchronized({
                     action: oper.action,
                     data: oper.data,
-                    // rowIds: getRelevantIds(oper.filter!),
-                    rowIds: entityIds
+                    rowIds: entityIds,
+                    remoteEntity: entity,
+                    remoteEntityId: entityId,
                 }, context);
             }
         }
@@ -144,7 +155,7 @@ class Synchronizer {
         (0, assert_1.default)(channel.entity === remoteEntity);
         (0, assert_1.default)(channel.entityId === remoteEntityId);
         if (channel.queue.find(ele => ele.oper.id === oper.id)) {
-            console.error('aaaaa');
+            console.error('channel.queue找到相同的需推送的oper');
         }
         channel.queue.push({
             oper,
@@ -172,7 +183,6 @@ class Synchronizer {
     async dispatchOperToChannels(oper, context) {
         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;
@@ -282,17 +292,17 @@ class Synchronizer {
                     (0, assert_1.default)(this.channelDict[c].queue.length === 0);
                 }
                 const pushedIds = [];
-                const unpushedIds = [];
+                const unPushedIds = [];
                 await Promise.all(dirtyOpers.map(async (oper) => {
                     const result = await this.dispatchOperToChannels(oper, context);
                     if (result) {
                         pushedIds.push(oper.id);
                     }
                     else {
-                        unpushedIds.push(oper.id);
+                        unPushedIds.push(oper.id);
                     }
                 }));
-                if (unpushedIds.length > 0) {
+                if (unPushedIds.length > 0) {
                     await context.operate('oper', {
                         id: await (0, uuid_1.generateNewIdAsync)(),
                         action: 'update',
@@ -302,7 +312,7 @@ class Synchronizer {
                         },
                         filter: {
                             id: {
-                                $in: unpushedIds,
+                                $in: unPushedIds,
                             }
                         }
                     }, {});
@@ -452,7 +462,7 @@ class Synchronizer {
             fn: async (context, params, headers, req, body) => {
                 // body中是传过来的oper数组信息
                 const { entity, entityId } = params;
-                const { [OAK_SYNC_HEADER_ENTITY]: meEntity, [OAK_SYNC_HEADER_ENTITYID]: meEntityId } = headers;
+                const { [OAK_SYNC_HEADER_ENTITY]: meEntity, [OAK_SYNC_HEADER_ENTITY_ID]: meEntityId } = headers;
                 if (process.env.NODE_ENV === 'development') {
                     console.log('接收到来自远端的sync数据', entity, JSON.stringify(body));
                 }

package/lib/types/Sync.d.ts

@@ -1,16 +1,16 @@
-import { EntityDict } from 'oak-domain/lib/types';
-import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
-import { BackendRuntimeContext } from 'oak-frontend-base/lib/context/BackendRuntimeContext';
-import { RemotePushInfo, RemotePullInfo, SelfEncryptInfo, SyncRemoteConfigBase, SyncSelfConfigBase, SyncConfig } from 'oak-domain/lib/types/Sync';
-interface SyncRemoteConfigWrapper<ED extends EntityDict & BaseEntityDict, Cxt extends BackendRuntimeContext<ED>> extends SyncRemoteConfigBase<ED, Cxt> {
-    getRemotePushInfo: (userId: string) => Promise<RemotePushInfo>;
-    getRemotePullInfo: (id: string) => Promise<RemotePullInfo>;
-}
-interface SyncSelfConfigWrapper<ED extends EntityDict & BaseEntityDict> extends SyncSelfConfigBase<ED> {
-    getSelfEncryptInfo: () => Promise<SelfEncryptInfo>;
-}
-export interface SyncConfigWrapper<ED extends EntityDict & BaseEntityDict, Cxt extends BackendRuntimeContext<ED>> {
-    self: SyncSelfConfigWrapper<ED>;
-    remotes: Array<SyncRemoteConfigWrapper<ED, Cxt>>;
-}
-export { RemotePushInfo, RemotePullInfo, SelfEncryptInfo, SyncConfig, };
+import { EntityDict } from 'oak-domain/lib/types';
+import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
+import { BackendRuntimeContext } from 'oak-frontend-base/lib/context/BackendRuntimeContext';
+import { RemotePushInfo, RemotePullInfo, SelfEncryptInfo, SyncRemoteConfigBase, SyncSelfConfigBase, SyncConfig } from 'oak-domain/lib/types/Sync';
+interface SyncRemoteConfigWrapper<ED extends EntityDict & BaseEntityDict, Cxt extends BackendRuntimeContext<ED>> extends SyncRemoteConfigBase<ED, Cxt> {
+    getRemotePushInfo: (userId: string) => Promise<RemotePushInfo>;
+    getRemotePullInfo: (id: string) => Promise<RemotePullInfo>;
+}
+interface SyncSelfConfigWrapper<ED extends EntityDict & BaseEntityDict> extends SyncSelfConfigBase<ED> {
+    getSelfEncryptInfo: () => Promise<SelfEncryptInfo>;
+}
+export interface SyncConfigWrapper<ED extends EntityDict & BaseEntityDict, Cxt extends BackendRuntimeContext<ED>> {
+    self: SyncSelfConfigWrapper<ED>;
+    remotes: Array<SyncRemoteConfigWrapper<ED, Cxt>>;
+}
+export { RemotePushInfo, RemotePullInfo, SelfEncryptInfo, SyncConfig, };

package/lib/types/Sync.js

@@ -1,5 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-;
-;
-;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+;
+;
+;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-backend-base",
-    "version": "4.1.5",
+    "version": "4.1.7",
     "description": "oak-backend-base",
     "main": "lib/index",
     "author": {
@@ -22,8 +22,8 @@
         "node-schedule": "^2.1.0",
         "oak-common-aspect": "^3.0.2",
         "oak-db": "^3.3.2",
-        "oak-domain": "^5.1.2",
-        "oak-frontend-base": "^5.3.10",
+        "oak-domain": "^5.1.7",
+        "oak-frontend-base": "^5.3.15",
         "socket.io": "^4.7.2",
         "socket.io-client": "^4.7.2",
         "uuid": "^8.3.2"