oak-backend-base 4.1.10 → 4.1.12

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,8 +151,18 @@ class AppLoader extends types_1.AppLoader {
         this.dbStore.connect();
     }
     async unmount() {
-        (0, index_1.clearPorts)();
-        this.dbStore.disconnect();
+        if (this.watcherTimerId) {
+            console.log('取消watcher...');
+            clearTimeout(this.watcherTimerId);
+            this.watcherTimerId = undefined;
+        }
+        for (const job in this.scheduledJobs) {
+            console.log(`取消定时任务【${job}】...`);
+            await this.scheduledJobs[job]?.cancel();
+            delete this.scheduledJobs[job];
+        }
+        await (0, index_1.clearPorts)();
+        await this.dbStore.disconnect();
     }
     async execAspect(name, headers, contextString, params) {
         // 从aspect过来的，不能有空cxtString，以防被误判为root
@@ -229,7 +241,7 @@ class AppLoader extends types_1.AppLoader {
                 }
             }
         }
-        this.dbStore.disconnect();
+        await this.dbStore.disconnect();
     }
     getStore() {
         return this.dbStore;
@@ -369,7 +381,7 @@ class AppLoader extends types_1.AppLoader {
             catch (err) {
                 console.error(`执行了checkpoint，发生错误：`, err);
             }
-            setTimeout(() => doWatchers(), 120000);
+            this.watcherTimerId = setTimeout(() => doWatchers(), 120000);
         };
         doWatchers();
     }
@@ -382,7 +394,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 +403,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 +426,15 @@ class AppLoader extends types_1.AppLoader {
                         }
                     }
                 });
+                if (!job) {
+                    // console.error(`定时器【${name}】创建失败，请检查cron表达式是否正确`);
+                    throw new Error(`定时器【${name}】创建失败，请检查cron表达式是否正确`);
+                }
+                if (this.scheduledJobs[name]) {
+                    // console.error(`定时器【${name}】已经存在，请检查定时器名称是否重复`);
+                    throw new Error(`定时器【${name}】已经存在，请检查定时器名称是否重复`);
+                }
+                this.scheduledJobs[name] = job;
             }
         }
     }
@@ -424,7 +445,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

@@ -66,7 +66,7 @@ class Synchronizer {
     contextBuilder;
     pushAccessMap = {};
     async startChannel2(context, channel) {
-        const { queue, api, selfEncryptInfo, entity, entityId, onFailed, timeout } = channel;
+        const { queue, api, selfEncryptInfo, entity, entityId, onFailed, timeout = 5000 } = channel;
         // todo 加密
         const opers = queue.map(ele => ele.oper);
         if (process.env.NODE_ENV === 'development') {
@@ -91,7 +91,7 @@ class Synchronizer {
                     [OAK_SYNC_HEADER_SIGN]: signature,
                 },
                 body,
-            }, timeout || 5000);
+            }, timeout);
             if (res.status !== 200) {
                 throw new Error(`sync数据时，访问api「${finalApi}」的结果不是200。「${res.status}」`);
             }
@@ -104,7 +104,7 @@ class Synchronizer {
             if (onFailed) {
                 context.on('rollback', async () => {
                     const context2 = this.contextBuilder();
-                    context2.begin();
+                    await context2.begin();
                     try {
                         await onFailed({
                             remoteEntity: entity,
@@ -117,10 +117,10 @@ class Synchronizer {
                             })),
                             reason: err,
                         }, context2);
-                        context2.commit();
+                        await context2.commit();
                     }
                     catch (err) {
-                        context2.rollback();
+                        await context2.rollback();
                     }
                 });
             }
@@ -526,7 +526,7 @@ class Synchronizer {
                     this.remotePullInfoMap[entity] = {};
                 }
                 if (!this.remotePullInfoMap[entity][entityId]) {
-                    const { getPullInfo, pullEntities } = this.config.remotes.find(ele => ele.entity === entity);
+                    const { getPullInfo, pullEntities, clockDriftDuration } = this.config.remotes.find(ele => ele.entity === entity);
                     const pullEntityDict = {};
                     if (pullEntities) {
                         pullEntities.forEach((def) => pullEntityDict[def.entity] = def);
@@ -538,10 +538,11 @@ class Synchronizer {
                             remoteEntityId: entityId,
                         }),
                         pullEntityDict,
+                        clockDriftDuration,
                     };
                     closeFn();
                 }
-                const { pullInfo, pullEntityDict } = this.remotePullInfoMap[entity][entityId];
+                const { pullInfo, pullEntityDict, clockDriftDuration } = this.remotePullInfoMap[entity][entityId];
                 const { userId, algorithm, publicKey, cxtInfo } = pullInfo;
                 (0, assert_1.default)(userId);
                 context.setCurrentUserId(userId);
@@ -549,8 +550,10 @@ class Synchronizer {
                     await context.initialize(cxtInfo);
                 }
                 const syncTimestamp = parseInt(syncTs, 10);
-                if (!(Date.now() - syncTimestamp < 10000)) {
-                    throw new Error('同步时钟漂移过长');
+                if (clockDriftDuration !== 0) {
+                    if (!(Date.now() - syncTimestamp < (clockDriftDuration || 10000))) {
+                        throw new types_1.OakClockDriftException('同步时钟漂移过长');
+                    }
                 }
                 if (!verify(publicKey, JSON.stringify(body), syncTs, syncNonce, syncSign)) {
                     throw new Error('sync验签失败');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-backend-base",
-    "version": "4.1.10",
+    "version": "4.1.12",
     "description": "oak-backend-base",
     "main": "lib/index",
     "author": {
@@ -21,9 +21,9 @@
         "mysql2": "^2.3.3",
         "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-db": "^3.3.4",
+        "oak-domain": "^5.1.13",
+        "oak-frontend-base": "^5.3.20",
         "socket.io": "^4.7.2",
         "socket.io-client": "^4.7.2",
         "uuid": "^8.3.2"