oak-backend-base 4.1.9 → 4.1.10

package/lib/Synchronizer.js

@@ -37,6 +37,27 @@ function verify(publicKey, body, ts, nonce, signature) {
     verify2.end();
     return verify2.verify(publicKey, signature, 'hex');
 }
+async function fetchWithTimeout(url, options, timeout = 5000) {
+    const controller = new AbortController();
+    const signal = controller.signal;
+    // 设置超时
+    const timeoutId = setTimeout(() => {
+        controller.abort();
+    }, timeout);
+    // 发起 fetch 请求并传递 signal
+    return fetch(url, Object.assign({}, options, { signal }))
+        .then(response => {
+        clearTimeout(timeoutId); // 如果请求成功，清除超时
+        return response;
+    })
+        .catch(error => {
+        clearTimeout(timeoutId); // 如果请求失败，清除超时
+        if (error.name === 'AbortError') {
+            throw new types_1.OakRequestTimeoutException();
+        }
+        throw error; // 其他错误
+    });
+}
 class Synchronizer {
     config;
     schema;
@@ -45,7 +66,7 @@ class Synchronizer {
     contextBuilder;
     pushAccessMap = {};
     async startChannel2(context, channel) {
-        const { queue, api, selfEncryptInfo, entity, entityId, onFailed } = channel;
+        const { queue, api, selfEncryptInfo, entity, entityId, onFailed, timeout } = channel;
         // todo 加密
         const opers = queue.map(ele => ele.oper);
         if (process.env.NODE_ENV === 'development') {
@@ -59,7 +80,7 @@ class Synchronizer {
         try {
             const body = JSON.stringify(opers);
             const { ts, nonce, signature } = await sign(selfEncryptInfo.privateKey, body);
-            const res = await fetch(finalApi, {
+            const res = await fetchWithTimeout(finalApi, {
                 method: 'post',
                 headers: {
                     'Content-Type': 'application/json',
@@ -70,7 +91,7 @@ class Synchronizer {
                     [OAK_SYNC_HEADER_SIGN]: signature,
                 },
                 body,
-            });
+            }, timeout || 5000);
             if (res.status !== 200) {
                 throw new Error(`sync数据时，访问api「${finalApi}」的结果不是200。「${res.status}」`);
             }
@@ -164,7 +185,7 @@ class Synchronizer {
             }
         }));
     }
-    pushOperToChannel(oper, userId, url, endpoint, remoteEntity, remoteEntityId, selfEncryptInfo, onSynchronized, onFailed) {
+    pushOperToChannel(oper, userId, url, endpoint, remoteEntity, remoteEntityId, selfEncryptInfo, onSynchronized, onFailed, timeout) {
         if (!this.channelDict[userId]) {
             // channel上缓存这些信息，暂不支持动态更新
             this.channelDict[userId] = {
@@ -174,6 +195,7 @@ class Synchronizer {
                 entityId: remoteEntityId,
                 selfEncryptInfo,
                 onFailed,
+                timeout,
             };
         }
         else {
@@ -220,7 +242,7 @@ class Synchronizer {
         if (pushEntityNodes && pushEntityNodes.length > 0) {
             // 每个pushEntityNode代表配置的一个remoteEntity 
             await Promise.all(pushEntityNodes.map(async (node) => {
-                const { projection, groupByUsers, getRemotePushInfo: getRemoteAccessInfo, groupBySelfEntity, endpoint, actions, onSynchronized, onFailed } = node;
+                const { projection, groupByUsers, getRemotePushInfo: getRemoteAccessInfo, groupBySelfEntity, endpoint, actions, onSynchronized, onFailed, timeout } = node;
                 // 定义中应该不可能没有actions
                 if (!actions || actions.includes(action)) {
                     const rows = await context.select(targetEntity, {
@@ -254,7 +276,7 @@ class Synchronizer {
                             userId,
                             remoteEntityId: entityId,
                         });
-                        this.pushOperToChannel(oper2, userId, url, endpoint, entity, entityId, selfEncryptInfo, onSynchronized, onFailed);
+                        this.pushOperToChannel(oper2, userId, url, endpoint, entity, entityId, selfEncryptInfo, onSynchronized, onFailed, timeout);
                     };
                     for (const userId in userSendDict) {
                         if (userId !== operatorId || !oper.bornAt) {
@@ -365,7 +387,7 @@ class Synchronizer {
         const { remotes, self } = config;
         // 根据remotes定义，建立从entity到需要同步的远端结点信息的Map
         remotes.forEach((remote) => {
-            const { getPushInfo, pushEntities: pushEntityDefs, endpoint, pathToUser, relationName: rnRemote, onFailed } = remote;
+            const { getPushInfo, pushEntities: pushEntityDefs, endpoint, pathToUser, relationName: rnRemote, onFailed, timeout } = remote;
             if (pushEntityDefs) {
                 const pushEntities = [];
                 const endpoint2 = (0, path_1.join)(endpoint || 'sync', self.entity);
@@ -433,6 +455,7 @@ class Synchronizer {
                                 actions,
                                 onSynchronized,
                                 onFailed,
+                                timeout,
                             }];
                     }
                     else {
@@ -446,6 +469,7 @@ class Synchronizer {
                             actions,
                             onSynchronized,
                             onFailed,
+                            timeout,
                         });
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-backend-base",
-    "version": "4.1.9",
+    "version": "4.1.10",
     "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.2",
+        "oak-common-aspect": "^3.0.4",
         "oak-db": "^3.3.2",
-        "oak-domain": "^5.1.9",
-        "oak-frontend-base": "^5.3.18",
+        "oak-domain": "^5.1.10",
+        "oak-frontend-base": "^5.3.19",
         "socket.io": "^4.7.2",
         "socket.io-client": "^4.7.2",
         "uuid": "^8.3.2"