oak-backend-base 4.1.10 → 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

@@ -111,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,
                             })),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-backend-base",
-    "version": "4.1.10",
+    "version": "4.1.11",
     "description": "oak-backend-base",
     "main": "lib/index",
     "author": {
@@ -22,8 +22,8 @@
         "node-schedule": "^2.1.0",
         "oak-common-aspect": "^3.0.4",
         "oak-db": "^3.3.2",
-        "oak-domain": "^5.1.10",
-        "oak-frontend-base": "^5.3.19",
+        "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"