From 5a7d2b2d55d8f4908846a90121fc5008fc3a6de2 Mon Sep 17 00:00:00 2001 From: ciniao <4041990@qq.com> Date: Tue, 2 Jan 2024 20:26:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=94=99=E8=AF=AFlog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gameLog.ts | 20 ++++++++++++++++++-- src/setWs.ts | 7 +++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/gameLog.ts b/src/gameLog.ts index c0cca31..9242fb2 100644 --- a/src/gameLog.ts +++ b/src/gameLog.ts @@ -1,4 +1,5 @@ import { Db, MongoClient } from "mongodb"; +import { Logger } from "tsrpc"; let logDB:Db; let errorLogDB:Db; @@ -28,13 +29,28 @@ async function connGameLogDB() { return logDB; } +export let mylogger: Logger = { + debug(...args: any[]){ + console.debug(...args); + }, + log(...args: any[]){ + console.log(...args); + }, + warn(...args: any[]){ + console.warn(...args); + }, + error(...args: any[]){ + addErrorLog( args ); + console.error(...args); + } +} process.on('uncaughtException',function(err:Error){ - addErrorLog((err?.stack)?.toString()); + addErrorLog( (err?.stack || err)?.toString() ); }) process.on('unhandledRejection', function (err:Error, promise) { - addErrorLog((err?.stack)?.toString()); + addErrorLog( (err?.stack || err)?.toString() ); }) async function addErrorLog(errData:any){ diff --git a/src/setWs.ts b/src/setWs.ts index 372bcc1..9fb132c 100644 --- a/src/setWs.ts +++ b/src/setWs.ts @@ -13,6 +13,7 @@ import {player} from './shared/protocols/user/type'; import {unQueueByConn} from './api_s2c/user/ApiLogin'; import {clusterPublish, setUidProcessId} from './clusterUtils'; import {clearGud, getGud} from './public/gud'; +import { mylogger } from './gameLog'; export async function createWs() { @@ -25,8 +26,9 @@ export async function createWs() { json: true, //API超时时间5分钟，为登陆排队做准备 apiTimeout: 300000, - logLevel: G.argv.logModel as LogLevel - }); + logLevel: G.argv.logModel as LogLevel, + logger:mylogger + }); setCrossWs(G.serverCross); await G.serverCross.autoImplementApi(resolve(__dirname, 'api_cross'), true); await G.serverCross.start(); @@ -37,6 +39,7 @@ export async function createWs() { wss: getWssFile(), //API超时时间5分钟，为登陆排队做准备，只针对游服 apiTimeout: 300000, + logger:mylogger }); setWs(G.server); await G.server.autoImplementApi(resolve(__dirname, 'api_s2c'), true); From bfe48a54f49dcf3e0da5f3c145e8066e4a8b5620 Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 2 Jan 2024 20:30:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20=E6=82=AC=E8=B5=8F=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=B8=8A=E9=99=90=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/xstask/ApiRefresh.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/api_s2c/xstask/ApiRefresh.ts b/src/api_s2c/xstask/ApiRefresh.ts index a66ee18..373a667 100644 --- a/src/api_s2c/xstask/ApiRefresh.ts +++ b/src/api_s2c/xstask/ApiRefresh.ts @@ -1,9 +1,9 @@ -import { ApiCall } from "tsrpc"; -import { PlayerFun } from '../../public/player'; -import { TeQuanFun } from '../../public/tequan'; -import { XstaskFun } from '../../public/xstask'; -import { ReqRefresh, ResRefresh } from "../../shared/protocols/xstask/PtlRefresh"; -import { HongDianChange } from "../hongdian/fun"; +import {ApiCall} from "tsrpc"; +import {PlayerFun} from '../../public/player'; +import {TeQuanFun} from '../../public/tequan'; +import {XstaskFun} from '../../public/xstask'; +import {ReqRefresh, ResRefresh} from "../../shared/protocols/xstask/PtlRefresh"; +import {HongDianChange} from "../hongdian/fun"; export default async function (call: ApiCall) { let info = await XstaskFun.getInfo(call.uid); @@ -15,6 +15,8 @@ export default async function (call: ApiCall) { let event = await G.mongodb.cEvent('xstask').findOne({uid: call.uid, type: 'xstask'}); if (event?.receiveNum >= 8) return call.error(globalThis.lng.xstask_11); + delNum = delNum - (event?.receiveNum || 0) + let change: ResRefresh = {}; let needDel = taskList.filter(task => task.receiveData == undefined || task.receiveData.rec == true); @@ -23,7 +25,7 @@ export default async function (call: ApiCall) { await PlayerFun.cutNeed(call, [meet.atn]); } else { change.useFreeRefreshNum = info.useFreeRefreshNum + 1; - XstaskFun.changeInfo(call.uid, { $inc: { useFreeRefreshNum: 1 } }); + XstaskFun.changeInfo(call.uid, {$inc: {useFreeRefreshNum: 1}}); } XstaskFun.delTasks(call.uid, needDel.map(v => v._id)); From ee99de169ddd69d6441a0d3f271a79b3acb6faf4 Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 2 Jan 2024 20:42:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Revert=20"fix=20=E6=82=AC=E8=B5=8F=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=B8=8A=E9=99=90=E9=99=90=E5=88=B6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit bfe48a54f49dcf3e0da5f3c145e8066e4a8b5620. --- src/api_s2c/xstask/ApiRefresh.ts | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/api_s2c/xstask/ApiRefresh.ts b/src/api_s2c/xstask/ApiRefresh.ts index 373a667..a66ee18 100644 --- a/src/api_s2c/xstask/ApiRefresh.ts +++ b/src/api_s2c/xstask/ApiRefresh.ts @@ -1,9 +1,9 @@ -import {ApiCall} from "tsrpc"; -import {PlayerFun} from '../../public/player'; -import {TeQuanFun} from '../../public/tequan'; -import {XstaskFun} from '../../public/xstask'; -import {ReqRefresh, ResRefresh} from "../../shared/protocols/xstask/PtlRefresh"; -import {HongDianChange} from "../hongdian/fun"; +import { ApiCall } from "tsrpc"; +import { PlayerFun } from '../../public/player'; +import { TeQuanFun } from '../../public/tequan'; +import { XstaskFun } from '../../public/xstask'; +import { ReqRefresh, ResRefresh } from "../../shared/protocols/xstask/PtlRefresh"; +import { HongDianChange } from "../hongdian/fun"; export default async function (call: ApiCall) { let info = await XstaskFun.getInfo(call.uid); @@ -15,8 +15,6 @@ export default async function (call: ApiCall) { let event = await G.mongodb.cEvent('xstask').findOne({uid: call.uid, type: 'xstask'}); if (event?.receiveNum >= 8) return call.error(globalThis.lng.xstask_11); - delNum = delNum - (event?.receiveNum || 0) - let change: ResRefresh = {}; let needDel = taskList.filter(task => task.receiveData == undefined || task.receiveData.rec == true); @@ -25,7 +23,7 @@ export default async function (call: ApiCall) { await PlayerFun.cutNeed(call, [meet.atn]); } else { change.useFreeRefreshNum = info.useFreeRefreshNum + 1; - XstaskFun.changeInfo(call.uid, {$inc: {useFreeRefreshNum: 1}}); + XstaskFun.changeInfo(call.uid, { $inc: { useFreeRefreshNum: 1 } }); } XstaskFun.delTasks(call.uid, needDel.map(v => v._id));