oak-backend-base 4.1.13 → 4.1.15

package/lib/AppLoader.js

@@ -371,7 +371,10 @@ class AppLoader extends types_1.AppLoader {
             count++;
             const start = Date.now();
             for (const w of totalWatchers) {
-                execOne(w, start);
+                /**
+                 * todo 原来这里是所有的watcher并行，会产生死锁，先改成串行，后续再优化
+                 */
+                await execOne(w, start);
             }
             const duration = Date.now() - start;
             console.log(`第${count}次执行watchers，共执行${watchers.length}个，耗时${duration}毫秒`);

package/lib/Synchronizer.js

@@ -144,7 +144,7 @@ class Synchronizer {
                     }
                 }, {});
                 const entityIds = operEntityArr.map(ele => ele.entityId);
-                return onSynchronized({
+                await onSynchronized({
                     action: oper.action,
                     data: oper.data,
                     rowIds: entityIds,
@@ -153,10 +153,8 @@ class Synchronizer {
                 }, context);
             }
         }
-        /**
-         * 自主将triggerData属性清零
-         */
         const operIds = queue.map(ele => ele.oper.id);
+        // 在内部清理相应的triggerData
         await context.operate('oper', {
             id: await (0, uuid_1.generateNewIdAsync)(),
             action: 'update',
@@ -359,6 +357,7 @@ class Synchronizer {
                     }
                 }));
                 if (unPushedIds.length > 0) {
+                    // 在内部清理相应的triggerData
                     await context.operate('oper', {
                         id: await (0, uuid_1.generateNewIdAsync)(),
                         action: 'update',
@@ -379,9 +378,15 @@ class Synchronizer {
             }
         }
         if (result) {
-            const exception = result.find(ele => ele instanceof Error);
-            if (exception) {
-                throw exception;
+            const exceptions = result.filter(ele => ele instanceof Error);
+            if (exceptions.length > 0) {
+                const notPartialSuccess = exceptions.find(ele => !(ele instanceof types_1.OakPartialSuccess));
+                if (notPartialSuccess) {
+                    throw notPartialSuccess;
+                }
+                else {
+                    console.warn('出现了PartialSuccess，部分Oper同步失败，事务仍然提交');
+                }
             }
         }
     }
@@ -488,6 +493,7 @@ class Synchronizer {
             strict: 'makeSure',
             singleton: true,
             grouped: true,
+            cleanTriggerDataBySelf: true,
             check: (operation) => {
                 const { data } = operation;
                 const { targetEntity, action } = data;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-backend-base",
-    "version": "4.1.13",
+    "version": "4.1.15",
     "description": "oak-backend-base",
     "main": "lib/index",
     "author": {
@@ -22,9 +22,9 @@
         "node-schedule": "^2.1.0",
         "oak-common-aspect": "^3.0.5",
         "oak-db": "^3.3.5",
-        "oak-domain": "^5.1.14",
-        "oak-frontend-base": "^5.3.22",
-        "socket.io": "^4.7.2",
+        "oak-domain": "^5.1.16",
+        "oak-frontend-base": "^5.3.25",
+        "socket.io": "^4.8.1",
         "socket.io-client": "^4.7.2",
         "uuid": "^8.3.2"
     },