oak-backend-base 4.1.12 → 4.1.14

package/lib/Synchronizer.js

@@ -38,6 +38,9 @@ function verify(publicKey, body, ts, nonce, signature) {
     return verify2.verify(publicKey, signature, 'hex');
 }
 async function fetchWithTimeout(url, options, timeout = 5000) {
+    if (typeof AbortController === 'undefined' || timeout === 0) {
+        return fetch(url, options);
+    }
     const controller = new AbortController();
     const signal = controller.signal;
     // 设置超时
@@ -141,7 +144,7 @@ class Synchronizer {
                     }
                 }, {});
                 const entityIds = operEntityArr.map(ele => ele.entityId);
-                return onSynchronized({
+                await onSynchronized({
                     action: oper.action,
                     data: oper.data,
                     rowIds: entityIds,
@@ -150,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',
@@ -356,6 +357,7 @@ class Synchronizer {
                     }
                 }));
                 if (unPushedIds.length > 0) {
+                    // 在内部清理相应的triggerData
                     await context.operate('oper', {
                         id: await (0, uuid_1.generateNewIdAsync)(),
                         action: 'update',
@@ -376,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同步失败，事务仍然提交');
+                }
             }
         }
     }
@@ -485,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.12",
+    "version": "4.1.14",
     "description": "oak-backend-base",
     "main": "lib/index",
     "author": {
@@ -20,10 +20,10 @@
         "mysql": "^2.18.1",
         "mysql2": "^2.3.3",
         "node-schedule": "^2.1.0",
-        "oak-common-aspect": "^3.0.4",
-        "oak-db": "^3.3.4",
-        "oak-domain": "^5.1.13",
-        "oak-frontend-base": "^5.3.20",
+        "oak-common-aspect": "^3.0.5",
+        "oak-db": "^3.3.5",
+        "oak-domain": "^5.1.15",
+        "oak-frontend-base": "^5.3.22",
         "socket.io": "^4.7.2",
         "socket.io-client": "^4.7.2",
         "uuid": "^8.3.2"