oak-backend-base 4.1.9 → 4.1.11

package/lib/AppLoader.d.ts

@@ -16,6 +16,8 @@ export declare class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt exten
     protected synchronizer?: Synchronizer<ED, Cxt>;
     protected contextBuilder: (store: DbStore<ED, Cxt>) => Cxt;
     private nsSocket?;
+    private watcherTimerId?;
+    private scheduledJobs;
     private requireSth;
     protected makeContext(cxtStr?: string, headers?: IncomingHttpHeaders): Promise<Cxt>;
     /**

package/lib/AppLoader.js

@@ -24,6 +24,8 @@ class AppLoader extends types_1.AppLoader {
     synchronizer;
     contextBuilder;
     nsSocket;
+    watcherTimerId;
+    scheduledJobs = {};
     requireSth(filePath) {
         const depFilePath = (0, path_1.join)(this.path, filePath);
         let sth;
@@ -149,6 +151,14 @@ class AppLoader extends types_1.AppLoader {
         this.dbStore.connect();
     }
     async unmount() {
+        if (this.watcherTimerId) {
+            console.log('取消watcher...');
+            clearTimeout(this.watcherTimerId);
+        }
+        for (const job in this.scheduledJobs) {
+            console.log(`取消定时任务【${job}】...`);
+            this.scheduledJobs[job].cancel();
+        }
         (0, index_1.clearPorts)();
         this.dbStore.disconnect();
     }
@@ -369,7 +379,7 @@ class AppLoader extends types_1.AppLoader {
             catch (err) {
                 console.error(`执行了checkpoint，发生错误：`, err);
             }
-            setTimeout(() => doWatchers(), 120000);
+            this.watcherTimerId = setTimeout(() => doWatchers(), 120000);
         };
         doWatchers();
     }
@@ -382,7 +392,7 @@ class AppLoader extends types_1.AppLoader {
         if (timers) {
             for (const timer of timers) {
                 const { cron, name } = timer;
-                (0, node_schedule_1.scheduleJob)(name, cron, async (date) => {
+                const job = (0, node_schedule_1.scheduleJob)(name, cron, async (date) => {
                     const start = Date.now();
                     console.log(`定时器【${name}】开始执行，时间是【${date.toLocaleTimeString()}】`);
                     if (timer.hasOwnProperty('entity')) {
@@ -391,7 +401,7 @@ class AppLoader extends types_1.AppLoader {
                             console.log(`定时器【${name}】执行成功，耗时${Date.now() - start}毫秒】，结果是`, result);
                         }
                         catch (err) {
-                            console.log(`定时器【${name}】执行成功，耗时${Date.now() - start}毫秒】，错误是`, err);
+                            console.warn(`定时器【${name}】执行失败，耗时${Date.now() - start}毫秒】，错误是`, err);
                         }
                     }
                     else {
@@ -414,6 +424,11 @@ class AppLoader extends types_1.AppLoader {
                         }
                     }
                 });
+                if (this.scheduledJobs[name]) {
+                    // console.error(`定时器【${name}】已经存在，请检查定时器名称是否重复`);
+                    throw new Error(`定时器【${name}】已经存在，请检查定时器名称是否重复`);
+                }
+                this.scheduledJobs[name] = job;
             }
         }
     }
@@ -424,7 +439,7 @@ class AppLoader extends types_1.AppLoader {
                 const start = Date.now();
                 try {
                     const result = await this.execWatcher(routine);
-                    console.warn(`例程【${routine.name}】执行成功，耗时${Date.now() - start}毫秒，结果是`, result);
+                    console.log(`例程【${routine.name}】执行成功，耗时${Date.now() - start}毫秒，结果是`, result);
                 }
                 catch (err) {
                     console.warn(`例程【${routine.name}】执行失败，耗时${Date.now() - start}毫秒，错误是`, err);

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}」`);
             }
@@ -90,7 +111,7 @@ class Synchronizer {
                             remoteEntityId: entityId,
                             data: queue.map((ele) => ({
                                 entity: ele.oper.targetEntity,
-                                rowIds: ele.oper.filter.id.$in,
+                                rowIds: ele.oper.filter.id.$in, // 暂时应该没什么用
                                 action: ele.oper.action,
                                 data: ele.oper.data,
                             })),
@@ -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.11",
     "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.11",
+        "oak-frontend-base": "^5.3.20",
         "socket.io": "^4.7.2",
         "socket.io-client": "^4.7.2",
         "uuid": "^8.3.2"