oak-backend-base 4.1.24 → 4.1.25

package/lib/AppLoader.d.ts

@@ -62,5 +62,6 @@ export declare class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt exten
     protected execFreeTimer(timer: FreeTimer<ED, Cxt>, context: Cxt): Promise<OperationResult<ED>> | undefined;
     startTimers(): void;
     execStartRoutines(): Promise<void>;
+    execStopRoutines(): Promise<void>;
     execRoutine(routine: <Cxt extends AsyncContext<ED>>(context: Cxt) => Promise<void>): Promise<void>;
 }

package/lib/AppLoader.js

@@ -59,13 +59,15 @@ class AppLoader extends types_1.AppLoader {
         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 {
-                    const ctx = await this.makeContext();
                     console.log(`调用internalErrorHandler【${handler.name}】处理内部错误事件`);
-                    handler.handle(ctx, type, message, errorToPublish);
+                    await handler.handle(ctx, type, message, errorToPublish);
+                    await ctx.commit();
                 }
                 catch (e) {
                     console.error('执行internalErrorHandler时出错', e);
+                    await ctx.rollback();
                 }
                 finally {
                     resolve();
@@ -513,6 +515,7 @@ class AppLoader extends types_1.AppLoader {
     async execStartRoutines() {
         const routines = this.requireSth('lib/routines/start') || [];
         for (const routine of routines) {
+            console.log(`执行启动例程【${routine.name}】...`);
             if (routine.hasOwnProperty('entity')) {
                 const start = Date.now();
                 try {
@@ -531,6 +534,42 @@ class AppLoader extends types_1.AppLoader {
                 try {
                     const result = await routineFn(context, {
                         socket: this.nsSocket,
+                        contextBuilder: () => this.makeContext(),
+                    });
+                    console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`);
+                    await context.commit();
+                }
+                catch (err) {
+                    console.error(`例程【${name}】执行失败，耗时${Date.now() - start}毫秒，错误是`, err);
+                    await context.rollback();
+                    throw err;
+                }
+            }
+        }
+    }
+    async execStopRoutines() {
+        const routines = this.requireSth('lib/routines/stop') || [];
+        for (const routine of routines) {
+            console.log(`执行停止例程【${routine.name}】...`);
+            if (routine.hasOwnProperty('entity')) {
+                const start = Date.now();
+                try {
+                    const result = await this.execWatcher(routine);
+                    console.log(`例程【${routine.name}】执行成功，耗时${Date.now() - start}毫秒，结果是`, result);
+                }
+                catch (err) {
+                    console.error(`例程【${routine.name}】执行失败，耗时${Date.now() - start}毫秒，错误是`, err);
+                    throw err;
+                }
+            }
+            else {
+                const { name, routine: routineFn } = routine;
+                const context = await this.makeContext();
+                const start = Date.now();
+                try {
+                    const result = await routineFn(context, {
+                        socket: this.nsSocket,
+                        contextBuilder: () => this.makeContext(),
                     });
                     console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`);
                     await context.commit();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-backend-base",
-    "version": "4.1.24",
+    "version": "4.1.25",
     "description": "oak-backend-base",
     "main": "lib/index",
     "author": {
@@ -23,7 +23,7 @@
         "node-schedule": "^2.1.0",
         "oak-common-aspect": "^3.0.5",
         "oak-db": "^3.3.11",
-        "oak-domain": "^5.1.30",
+        "oak-domain": "^5.1.31",
         "oak-frontend-base": "^5.3.43",
         "socket.io": "^4.8.1",
         "socket.io-client": "^4.7.2",