oak-backend-base 4.1.26 → 4.1.27

package/lib/AppLoader.d.ts

@@ -1,5 +1,5 @@
 import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
-import { AppLoader as GeneralAppLoader, Trigger, EntityDict, Watcher, OpRecord, FreeTimer, OperationResult } from "oak-domain/lib/types";
+import { AppLoader as GeneralAppLoader, Trigger, EntityDict, Watcher, OpRecord, FreeTimer, OperationResult, BaseTimer } from "oak-domain/lib/types";
 import { BackendRuntimeContext } from 'oak-frontend-base/lib/context/BackendRuntimeContext';
 import { IncomingHttpHeaders, IncomingMessage } from 'http';
 import { Namespace } from 'socket.io';
@@ -59,7 +59,8 @@ export declare class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt exten
     protected getCheckpointTs(): number;
     protected checkpoint(): Promise<number>;
     startWatchers(): void;
-    protected execFreeTimer(timer: FreeTimer<ED, Cxt>, context: Cxt): Promise<OperationResult<ED>> | undefined;
+    protected execBaseTimer(timer: BaseTimer<ED, Cxt>, context: Cxt): Promise<OperationResult<ED>> | undefined;
+    protected execFreeTimer(timer: FreeTimer<ED, Cxt>, contextBuilder: () => Promise<Cxt>): Promise<OperationResult<ED>> | undefined;
     startTimers(): void;
     execStartRoutines(): Promise<void>;
     execStopRoutines(): Promise<void>;

package/lib/AppLoader.js

@@ -57,13 +57,12 @@ class AppLoader extends types_1.AppLoader {
      * 发布内部错误事件给注册的处理器
      */
     async publishInternalError(type, message, err) {
-        const errorToPublish = (0, lodash_1.cloneDeep)(err);
         await Promise.all(this.internalErrorHandlers.map((handler) => {
             return new Promise(async (resolve) => {
                 const ctx = await this.makeContext();
                 try {
                     console.log(`调用internalErrorHandler【${handler.name}】处理内部错误事件`);
-                    await handler.handle(ctx, type, message, errorToPublish);
+                    await handler.handle(ctx, type, message, err);
                     await ctx.commit();
                 }
                 catch (e) {
@@ -370,8 +369,22 @@ class AppLoader extends types_1.AppLoader {
         });
     }
     async execWatcher(watcher) {
-        const context = await this.makeContext();
         let result;
+        if (watcher.hasOwnProperty('type') && watcher.type === 'free') {
+            const selectContext = await this.makeContext();
+            const { entity, projection, fn, filter, singleton, forUpdate } = watcher;
+            const filter2 = typeof filter === 'function' ? await filter() : (0, lodash_1.cloneDeep)(filter);
+            const projection2 = typeof projection === 'function' ? await projection() : (0, lodash_1.cloneDeep)(projection);
+            const rows = await this.selectInWatcher(entity, {
+                data: projection2,
+                filter: filter2,
+            }, selectContext, forUpdate, singleton);
+            if (rows.length > 0) {
+                result = await fn(() => this.makeContext(), rows);
+            }
+            return result;
+        }
+        const context = await this.makeContext();
         try {
             if (watcher.hasOwnProperty('actionData')) {
                 const { entity, action, filter, actionData, singleton } = watcher;
@@ -423,7 +436,13 @@ class AppLoader extends types_1.AppLoader {
         const { watchers: adWatchers } = (0, IntrinsicLogics_1.makeIntrinsicLogics)(this.dbStore.getSchema(), ActionDefDict);
         const totalWatchers = (watchers || []).concat(adWatchers);
         let count = 0;
+        const skipOnceSet = new Set();
         const execOne = async (watcher, start) => {
+            if (skipOnceSet.has(watcher.name)) {
+                skipOnceSet.delete(watcher.name);
+                console.log(`跳过本次执行watcher【${watcher.name}】`);
+                return;
+            }
             try {
                 const result = await this.execWatcher(watcher);
                 if (result) {
@@ -455,12 +474,22 @@ class AppLoader extends types_1.AppLoader {
             }
             this.watcherTimerId = setTimeout(() => doWatchers(), 120000);
         };
+        // 首次执行时，跳过所有lazy的watcher
+        for (const w of totalWatchers) {
+            if (w.lazy) {
+                skipOnceSet.add(w.name);
+            }
+        }
         doWatchers();
     }
-    execFreeTimer(timer, context) {
+    execBaseTimer(timer, context) {
         const { timer: timerFn } = timer;
         return timerFn(context);
     }
+    execFreeTimer(timer, contextBuilder) {
+        const { timer: timerFn } = timer;
+        return timerFn(contextBuilder);
+    }
     startTimers() {
         const timers = this.requireSth('lib/timers/index');
         if (timers) {
@@ -480,9 +509,20 @@ class AppLoader extends types_1.AppLoader {
                         }
                     }
                     else {
+                        if (timer.hasOwnProperty('type') && timer.type === 'free') {
+                            try {
+                                const result = await this.execFreeTimer(timer, () => this.makeContext());
+                                console.log(`定时器【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是`, result);
+                            }
+                            catch (err) {
+                                console.error(`定时器【${name}】执行失败，耗时${Date.now() - start}毫秒，错误是`, err);
+                                this.publishInternalError(`timer`, `定时器【${name}】执行失败`, err);
+                            }
+                            return;
+                        }
                         const context = await this.makeContext();
                         try {
-                            const result = await this.execFreeTimer(timer, context);
+                            const result = await this.execBaseTimer(timer, context);
                             if (result) {
                                 console.log(`定时器【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是`, result);
                             }

package/lib/ClusterAppLoader.d.ts

@@ -1,5 +1,5 @@
 import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
-import { EntityDict, OperationResult, Trigger, Watcher, FreeTimer } from 'oak-domain/lib/types';
+import { EntityDict, OperationResult, Trigger, Watcher, FreeTimer, BaseTimer } from 'oak-domain/lib/types';
 import { BackendRuntimeContext } from 'oak-frontend-base/lib/context/BackendRuntimeContext';
 import { AppLoader } from './AppLoader';
 import { Namespace } from 'socket.io';
@@ -15,6 +15,7 @@ export declare class ClusterAppLoader<ED extends EntityDict & BaseEntityDict, Cx
     protected operateInWatcher<T extends keyof ED>(entity: T, operation: ED[T]['Update'], context: Cxt, singleton?: true): Promise<OperationResult<ED>>;
     protected selectInWatcher<T extends keyof ED>(entity: T, selection: ED[T]['Selection'], context: Cxt, forUpdate?: true, singleton?: true): Promise<Partial<ED[T]['Schema']>[]>;
     protected execWatcher(watcher: Watcher<ED, keyof ED, Cxt>): Promise<OperationResult<ED> | undefined>;
-    protected execFreeTimer(timer: FreeTimer<ED, Cxt>, context: Cxt): Promise<OperationResult<ED>> | undefined;
+    protected execBaseTimer(timer: BaseTimer<ED, Cxt>, context: Cxt): Promise<OperationResult<ED>> | undefined;
+    protected execFreeTimer(timer: FreeTimer<ED, Cxt>, contextBuilder: () => Promise<Cxt>): Promise<OperationResult<ED>> | undefined;
     protected checkpoint(): Promise<number>;
 }

package/lib/ClusterAppLoader.js

@@ -168,11 +168,17 @@ class ClusterAppLoader extends AppLoader_1.AppLoader {
         }
         return super.execWatcher(watcher);
     }
-    execFreeTimer(timer, context) {
+    execBaseTimer(timer, context) {
         if (timer.singleton && (0, env_1.getClusterInfo)().instanceId !== 0) {
             return;
         }
-        return super.execFreeTimer(timer, context);
+        return super.execBaseTimer(timer, context);
+    }
+    execFreeTimer(timer, contextBuilder) {
+        if (timer.singleton && (0, env_1.getClusterInfo)().instanceId !== 0) {
+            return;
+        }
+        return super.execFreeTimer(timer, contextBuilder);
     }
     async checkpoint() {
         const { instanceCount, instanceId } = (0, env_1.getClusterInfo)();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-backend-base",
-    "version": "4.1.26",
+    "version": "4.1.27",
     "description": "oak-backend-base",
     "main": "lib/index",
     "author": {
@@ -22,8 +22,8 @@
         "mysql2": "^2.3.3",
         "node-schedule": "^2.1.0",
         "oak-common-aspect": "^3.0.5",
-        "oak-db": "^3.3.12",
-        "oak-domain": "^5.1.33",
+        "oak-db": "^3.3.13",
+        "oak-domain": "^5.1.34",
         "oak-frontend-base": "^5.3.45",
         "socket.io": "^4.8.1",
         "socket.io-client": "^4.7.2",