Oak-Team
/
oak-backend-base
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 18 Wiki Activity

fix: 错误处理时的ctx未被正确处理

This commit is contained in:
QCQCQC@Debian 2025-12-10 15:51:40 +08:00
parent e7053c46ef
commit 77f568fdff
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/AppLoader.js
View File

@ -59,13 +59,15 @@ class AppLoader extends types_1.AppLoader {
const errorToPublish = (0, lodash_1.cloneDeep)(err); const errorToPublish = (0, lodash_1.cloneDeep)(err);
await Promise.all(this.internalErrorHandlers.map((handler) => { await Promise.all(this.internalErrorHandlers.map((handler) => {
return new Promise(async (resolve) => { return new Promise(async (resolve) => {
const ctx = await this.makeContext();
try { try {
const ctx = await this.makeContext();
console.log(`调用internalErrorHandler【${handler.name}】处理内部错误事件`); console.log(`调用internalErrorHandler【${handler.name}】处理内部错误事件`);
handler.handle(ctx, type, message, errorToPublish); await handler.handle(ctx, type, message, errorToPublish);
await ctx.commit();
} }
catch (e) { catch (e) {
console.error('执行internalErrorHandler时出错', e); console.error('执行internalErrorHandler时出错', e);
await ctx.rollback();
} }
finally { finally {
resolve(); resolve();
@ -532,6 +534,7 @@ class AppLoader extends types_1.AppLoader {
try { try {
const result = await routineFn(context, { const result = await routineFn(context, {
socket: this.nsSocket, socket: this.nsSocket,
contextBuilder: () => this.makeContext(),
}); });
console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`); console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`);
await context.commit(); await context.commit();
@ -566,6 +569,7 @@ class AppLoader extends types_1.AppLoader {
try { try {
const result = await routineFn(context, { const result = await routineFn(context, {
socket: this.nsSocket, socket: this.nsSocket,
contextBuilder: () => this.makeContext(),
}); });
console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`); console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`);
await context.commit(); await context.commit();

8
src/AppLoader.ts
View File

@ -70,12 +70,14 @@ export class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt extends Backe
await Promise.all(this.internalErrorHandlers.map( await Promise.all(this.internalErrorHandlers.map(
(handler) => { (handler) => {
return new Promise<void>(async (resolve) => { return new Promise<void>(async (resolve) => {
const ctx = await this.makeContext();
try { try {
const ctx = await this.makeContext();
console.log(`调用internalErrorHandler【${handler.name}】处理内部错误事件`); console.log(`调用internalErrorHandler【${handler.name}】处理内部错误事件`);
handler.handle(ctx, type, message, errorToPublish); await handler.handle(ctx, type, message, errorToPublish);
await ctx.commit()
} catch (e) { } catch (e) {
console.error('执行internalErrorHandler时出错', e); console.error('执行internalErrorHandler时出错', e);
await ctx.rollback();
} finally { } finally {
resolve(); resolve();
} }
@ -625,6 +627,7 @@ export class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt extends Backe
try { try {
const result = await routineFn(context, { const result = await routineFn(context, {
socket: this.nsSocket!, socket: this.nsSocket!,
contextBuilder: () => this.makeContext(),
}); });
console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`); console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`);
await context.commit(); await context.commit();
@ -661,6 +664,7 @@ export class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt extends Backe
try { try {
const result = await routineFn(context, { const result = await routineFn(context, {
socket: this.nsSocket!, socket: this.nsSocket!,
contextBuilder: () => this.makeContext(),
}); });
console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`); console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`);
await context.commit(); await context.commit();