rpc优化:所有remote加上try catch

This commit is contained in:
luying
2022-01-26 17:41:30 +08:00
parent c909d899ba
commit 6d2cafc119
11 changed files with 920 additions and 372 deletions
@@ -6,6 +6,7 @@ import { _getActivitiesByType, _getActivityById, _getActivities } from '../../..
import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService'; import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService';
import { taflush } from '../../../services/sdkService'; import { taflush } from '../../../services/sdkService';
import { ActivityInRemote } from '../../../domain/activityField/activityField'; import { ActivityInRemote } from '../../../domain/activityField/activityField';
import { errlogger } from '../../../util/logger';
export default function (app: Application) { export default function (app: Application) {
new HandlerService(app, {}); new HandlerService(app, {});
@@ -29,10 +30,15 @@ export class ActivityRemote {
* 重载json资源 * 重载json资源
*/ */
public async reloadResources() { public async reloadResources() {
try {
reloadResources(); reloadResources();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async loadActivities() { public async loadActivities() {
try {
let servers = await ServerlistModel.findByEnv(this.app.get('env')); let servers = await ServerlistModel.findByEnv(this.app.get('env'));
for(let { id: serverId, activityGroupId } of servers) { for(let { id: serverId, activityGroupId } of servers) {
for(let groupId of activityGroupId) { for(let groupId of activityGroupId) {
@@ -56,6 +62,9 @@ export class ActivityRemote {
this.app.set('activities', this.activities); this.app.set('activities', this.activities);
this.app.set('groupToServer', this.groupToServer); this.app.set('groupToServer', this.groupToServer);
// console.log('****** loadActivities') // console.log('****** loadActivities')
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
private setActivityTypeAndServer() { private setActivityTypeAndServer() {
@@ -87,6 +96,7 @@ export class ActivityRemote {
} }
public async updateActivities(activities: ActivityInRemote[]) { public async updateActivities(activities: ActivityInRemote[]) {
try {
// console.log('******* activities', activities) // console.log('******* activities', activities)
let activityIds: number[] = []; let activityIds: number[] = [];
for(let activity of activities) { for(let activity of activities) {
@@ -99,9 +109,13 @@ export class ActivityRemote {
this.app.set('activityByType', this.activityByType); this.app.set('activityByType', this.activityByType);
this.app.set('activities', this.activities); this.app.set('activities', this.activities);
this.app.set('groupToServer', this.groupToServer); this.app.set('groupToServer', this.groupToServer);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async deleteActivities(activityIds: number[]) { public async deleteActivities(activityIds: number[]) {
try {
for(let activityId of activityIds) { for(let activityId of activityIds) {
this.activities.delete(activityId); this.activities.delete(activityId);
} }
@@ -111,9 +125,13 @@ export class ActivityRemote {
this.app.set('activityByType', this.activityByType); this.app.set('activityByType', this.activityByType);
this.app.set('activities', this.activities); this.app.set('activities', this.activities);
this.app.set('groupToServer', this.groupToServer); this.app.set('groupToServer', this.groupToServer);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async saveGroupToServer(groupId: number, serverIds: number[]) { public async saveGroupToServer(groupId: number, serverIds: number[]) {
try {
this.groupToServer.set(groupId, serverIds); this.groupToServer.set(groupId, serverIds);
this.setActivityTypeAndServer(); this.setActivityTypeAndServer();
@@ -121,42 +139,77 @@ export class ActivityRemote {
this.app.set('activityByType', this.activityByType); this.app.set('activityByType', this.activityByType);
this.app.set('activities', this.activities); this.app.set('activities', this.activities);
this.app.set('groupToServer', this.groupToServer); this.app.set('groupToServer', this.groupToServer);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async saveActivitiesToGroup(groupId: number, activities: number[]) { public async saveActivitiesToGroup(groupId: number, activities: number[]) {
try {
for(let activityId of activities) { for(let activityId of activities) {
if(this.activities.get(activityId)) { if(this.activities.get(activityId)) {
this.activities.get(activityId).groupId = groupId; this.activities.get(activityId).groupId = groupId;
} }
} }
this.setActivityTypeAndServer(); this.setActivityTypeAndServer();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public getActivityById(activityId: number) { public getActivityById(activityId: number) {
try {
return _getActivityById(activityId); return _getActivityById(activityId);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public getActivitiesByType(serverId: number, type: number) { public getActivitiesByType(serverId: number, type: number) {
try {
return _getActivitiesByType(serverId, type); return _getActivitiesByType(serverId, type);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public getActivities() { public getActivities() {
try {
return _getActivities(); return _getActivities();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public setServerMainten(serverIds: number[], startTime: number, endTime: number) { public setServerMainten(serverIds: number[], startTime: number, endTime: number) {
try {
setServerMainten(serverIds, startTime, endTime); setServerMainten(serverIds, startTime, endTime);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public stopServerMainten(serverIds: number[]) { public stopServerMainten(serverIds: number[]) {
try {
stopServerMainten(serverIds); stopServerMainten(serverIds);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public getServerMainten(serverId: number) { public getServerMainten(serverId: number) {
try {
return getServerMainten(serverId); return getServerMainten(serverId);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public taflush() { public taflush() {
try {
return taflush(); return taflush();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
} }
@@ -3,6 +3,7 @@ import { PVPConfigModel, PVPConfigType } from '../../../db/SystemConfig';
import { reloadResources } from '../../../pubUtils/data'; import { reloadResources } from '../../../pubUtils/data';
import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService'; import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService';
import { taflush } from '../../../services/sdkService'; import { taflush } from '../../../services/sdkService';
import { errlogger } from '../../../util/logger';
export default function (app: Application) { export default function (app: Application) {
new HandlerService(app, {}); new HandlerService(app, {});
@@ -80,35 +81,63 @@ export class BattleRemote {
* 重载json资源 * 重载json资源
*/ */
public async reloadResources() { public async reloadResources() {
try {
reloadResources(); reloadResources();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public setPvpSeasonNum(pvpConfig: PVPConfigType) { public setPvpSeasonNum(pvpConfig: PVPConfigType) {
try {
if(pvpConfig) { if(pvpConfig) {
this.app.set('pvpSeasonNum', pvpConfig.seasonNum); this.app.set('pvpSeasonNum', pvpConfig.seasonNum);
this.app.set('pvpSeasonEndTime', pvpConfig.seasonEndTime); this.app.set('pvpSeasonEndTime', pvpConfig.seasonEndTime);
} }
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async initPvpSeasonNum() { public async initPvpSeasonNum() {
try {
let pvpConfig = await PVPConfigModel.findCurPVPConfig(); let pvpConfig = await PVPConfigModel.findCurPVPConfig();
this.setPvpSeasonNum(pvpConfig); this.setPvpSeasonNum(pvpConfig);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public setServerMainten(serverIds: number[], startTime: number, endTime: number) { public setServerMainten(serverIds: number[], startTime: number, endTime: number) {
try {
setServerMainten(serverIds, startTime, endTime); setServerMainten(serverIds, startTime, endTime);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public stopServerMainten(serverIds: number[]) { public stopServerMainten(serverIds: number[]) {
try {
stopServerMainten(serverIds); stopServerMainten(serverIds);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public getServerMainten(serverId: number) { public getServerMainten(serverId: number) {
try {
return getServerMainten(serverId); return getServerMainten(serverId);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public taflush() { public taflush() {
try {
return taflush(); return taflush();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
} }
@@ -3,6 +3,7 @@ import { resResult } from '../../../pubUtils/util';
import { STATUS } from '../../../consts'; import { STATUS } from '../../../consts';
import { handleComBtlProgress } from '../../../services/comBattleService'; import { handleComBtlProgress } from '../../../services/comBattleService';
import { MemComBtlTeam } from '../../../domain/battleField/ComBattleTeamField'; import { MemComBtlTeam } from '../../../domain/battleField/ComBattleTeamField';
import { errlogger } from '../../../util/logger';
export default function (app: Application) { export default function (app: Application) {
new HandlerService(app, {}); new HandlerService(app, {});
@@ -117,6 +118,7 @@ export class ComBattleRemote {
} }
public async hurt(uid: string, sid: string, name: string, bossHurt: number, actorHurt: [{ actorId: number, actorHurt: number }]) { public async hurt(uid: string, sid: string, name: string, bossHurt: number, actorHurt: [{ actorId: number, actorHurt: number }]) {
try {
console.log('hurt channel name: ', name); console.log('hurt channel name: ', name);
let channelService = this.app.get('channelService'); let channelService = this.app.get('channelService');
this.bossHp -= bossHurt; this.bossHp -= bossHurt;
@@ -128,9 +130,13 @@ export class ComBattleRemote {
channel.pushMessage('bossHp', resResult(STATUS.SUCCESS, { bossHp: this.bossHp })); channel.pushMessage('bossHp', resResult(STATUS.SUCCESS, { bossHp: this.bossHp }));
} }
return this.bossHp; return this.bossHp;
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async leaveFromBattle(roleId: string, teamCode: string ) { public async leaveFromBattle(roleId: string, teamCode: string ) {
try {
let teamMap: Map<string, MemComBtlTeam> = this.app.get('teamMap'); let teamMap: Map<string, MemComBtlTeam> = this.app.get('teamMap');
if(teamMap && teamMap.has(teamCode)) { if(teamMap && teamMap.has(teamCode)) {
let myTeam = teamMap.get(teamCode); let myTeam = teamMap.get(teamCode);
@@ -144,5 +150,8 @@ export class ComBattleRemote {
await handleComBtlProgress(myTeam, this.app.get('robotHurtTimer'), teamMap, channel); // 结算 await handleComBtlProgress(myTeam, this.app.get('robotHurtTimer'), teamMap, channel); // 结算
} }
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
} }
@@ -14,6 +14,7 @@ import { RankFirstType } from '../../../db/RankFirst';
import { LotType } from '../../../db/Lot'; import { LotType } from '../../../db/Lot';
import { _checkFilterWords, getTire, taflush } from '../../../services/sdkService'; import { _checkFilterWords, getTire, taflush } from '../../../services/sdkService';
import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService'; import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService';
import { errlogger } from '../../../util/logger';
export default function (app: Application) { export default function (app: Application) {
new HandlerService(app, {}); new HandlerService(app, {});
@@ -55,6 +56,7 @@ export class ChatRemote {
* *
*/ */
public async addWorldChannel(roleId: string, serverId: number, sid: string, flag: boolean = true) { public async addWorldChannel(roleId: string, serverId: number, sid: string, flag: boolean = true) {
try {
const name = `world${serverId}`; const name = `world${serverId}`;
let channel = this.channelService.getChannel(name, flag); let channel = this.channelService.getChannel(name, flag);
if (!channel) return; if (!channel) return;
@@ -63,6 +65,9 @@ export class ChatRemote {
roleId roleId
}; };
return this.getWorldChannel(name); return this.getWorldChannel(name);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -95,12 +100,16 @@ export class ChatRemote {
* *
*/ */
public async kickWorldChannel(roleId: string, sid: string, serverId: number) { public async kickWorldChannel(roleId: string, sid: string, serverId: number) {
try {
const name = `world${serverId}`; const name = `world${serverId}`;
let channel = this.channelService.getChannel(name, false); let channel = this.channelService.getChannel(name, false);
// leave channel // leave channel
if (!channel) return; if (!channel) return;
channel.leave(roleId, sid); channel.leave(roleId, sid);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -110,6 +119,7 @@ export class ChatRemote {
* @param param 信息 * @param param 信息
*/ */
public async sendWorldMessage(serverId: number, param: any) { public async sendWorldMessage(serverId: number, param: any) {
try {
const name = `world${serverId}`; const name = `world${serverId}`;
let channel = this.channelService.getChannel(name, false); let channel = this.channelService.getChannel(name, false);
@@ -117,6 +127,9 @@ export class ChatRemote {
if (!!channel) { if (!!channel) {
channel.pushMessage('onWorldMessage', resResult(STATUS.SUCCESS, param)); channel.pushMessage('onWorldMessage', resResult(STATUS.SUCCESS, param));
} }
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -127,9 +140,13 @@ export class ChatRemote {
* @memberof ChatRemote * @memberof ChatRemote
*/ */
public async addChannel(channelName: string, roleId: string, sid: string) { public async addChannel(channelName: string, roleId: string, sid: string) {
try {
let channel = this.channelService.getChannel(channelName, true); let channel = this.channelService.getChannel(channelName, true);
if (!channel) return; if (!channel) return;
addUserToChannel(channel, new ChannelUser(roleId, sid)); addUserToChannel(channel, new ChannelUser(roleId, sid));
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -140,10 +157,14 @@ export class ChatRemote {
* @memberof ChatRemote * @memberof ChatRemote
*/ */
public async leaveChannel(channelName: string, roleId: string, sid: string) { public async leaveChannel(channelName: string, roleId: string, sid: string) {
try {
let channel = this.channelService.getChannel(channelName, false); let channel = this.channelService.getChannel(channelName, false);
// leave channel // leave channel
if (!channel) return; if (!channel) return;
channel.leave(roleId, sid); channel.leave(roleId, sid);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -152,10 +173,14 @@ export class ChatRemote {
* @memberof ChatRemote * @memberof ChatRemote
*/ */
public async sendGroupMsg(roomId: string, msg: Partial<GroupMessageType>) { public async sendGroupMsg(roomId: string, msg: Partial<GroupMessageType>) {
try {
let channel = this.channelService.getChannel(roomId, false); let channel = this.channelService.getChannel(roomId, false);
if (!channel) return; if (!channel) return;
const roleInfo = await getSimpleRoleInfo(msg.roleId); const roleInfo = await getSimpleRoleInfo(msg.roleId);
channel.pushMessage(ON_GROUP_MSG_ROUTE, resResult(STATUS.SUCCESS, { ...msg, roleInfo })); channel.pushMessage(ON_GROUP_MSG_ROUTE, resResult(STATUS.SUCCESS, { ...msg, roleInfo }));
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -164,7 +189,11 @@ export class ChatRemote {
* @memberof ChatRemote * @memberof ChatRemote
*/ */
public async sendPrivateMsg(msg: Partial<PrivateMessageType>) { public async sendPrivateMsg(msg: Partial<PrivateMessageType>) {
try {
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -172,10 +201,14 @@ export class ChatRemote {
* @param serverId * @param serverId
*/ */
public async sendGuildActivityEnd(serverId: number) { public async sendGuildActivityEnd(serverId: number) {
try {
let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId); let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId);
let channel = this.channelService.getChannel(roomId, false); let channel = this.channelService.getChannel(roomId, false);
if (!channel) return; if (!channel) return;
channel.pushMessage(this.GUILD_ACTIVITY_END, resResult(STATUS.SUCCESS, {})); channel.pushMessage(this.GUILD_ACTIVITY_END, resResult(STATUS.SUCCESS, {}));
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -183,10 +216,14 @@ export class ChatRemote {
* @param serverId * @param serverId
*/ */
public async sendRaceActivityStart(serverId: number) { public async sendRaceActivityStart(serverId: number) {
try {
let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId); let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId);
let channel = this.channelService.getChannel(roomId, false); let channel = this.channelService.getChannel(roomId, false);
if (!channel) return; if (!channel) return;
channel.pushMessage(this.RACE_ACTIVITY_START, resResult(STATUS.SUCCESS, {})); channel.pushMessage(this.RACE_ACTIVITY_START, resResult(STATUS.SUCCESS, {}));
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -194,18 +231,26 @@ export class ChatRemote {
* @param serverId * @param serverId
*/ */
public async sendRankTopUpdated(serverId: number, ranks: (RankFirstType & {status: number})[]) { public async sendRankTopUpdated(serverId: number, ranks: (RankFirstType & {status: number})[]) {
try {
let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId); let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId);
let channel = this.channelService.getChannel(roomId, false); let channel = this.channelService.getChannel(roomId, false);
if (!channel) return; if (!channel) return;
channel.pushMessage(this.RANK_TOP_UPDATE, resResult(STATUS.SUCCESS, { ranks })); channel.pushMessage(this.RANK_TOP_UPDATE, resResult(STATUS.SUCCESS, { ranks }));
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
* 重载json资源 * 重载json资源
*/ */
public async reloadResources() { public async reloadResources() {
try {
reloadResources(); reloadResources();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
@@ -214,11 +259,15 @@ export class ChatRemote {
* @param serverId * @param serverId
*/ */
public async sendGuildActivityUpdate(serverId: number) { public async sendGuildActivityUpdate(serverId: number) {
try {
let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId); let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId);
let channel = this.channelService.getChannel(roomId, false); let channel = this.channelService.getChannel(roomId, false);
if (!channel) return; if (!channel) return;
let guildActivities = getAllGuildActivityStatus(); let guildActivities = getAllGuildActivityStatus();
channel.pushMessage(this.GUILD_ACTIVITY_STATUS_UPDATE, resResult(STATUS.SUCCESS, { guildActivities })); channel.pushMessage(this.GUILD_ACTIVITY_STATUS_UPDATE, resResult(STATUS.SUCCESS, { guildActivities }));
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -228,10 +277,14 @@ export class ChatRemote {
* @param mails 邮件内容 * @param mails 邮件内容
*/ */
public async sendMail(serverId: number, path: string, data: { mails: MailParam[] }) { public async sendMail(serverId: number, path: string, data: { mails: MailParam[] }) {
try {
let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId); let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId);
let channel = this.channelService.getChannel(roomId, false); let channel = this.channelService.getChannel(roomId, false);
if (!channel) return; if (!channel) return;
channel.pushMessage(path, resResult(STATUS.SUCCESS, data)); channel.pushMessage(path, resResult(STATUS.SUCCESS, data));
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -239,21 +292,29 @@ export class ChatRemote {
* @param serverId * @param serverId
*/ */
public async sendServerMaintenance(serverId: number) { public async sendServerMaintenance(serverId: number) {
try {
let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId); let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId);
let channel = this.channelService.getChannel(roomId, false); let channel = this.channelService.getChannel(roomId, false);
if (!channel) return { result: false, serverId }; if (!channel) return { result: false, serverId };
channel.pushMessage('onServerMaintenance', resResult(STATUS.SERVER_MAINTENANCE)); channel.pushMessage('onServerMaintenance', resResult(STATUS.SERVER_MAINTENANCE));
return { result: true, serverId }; return { result: true, serverId };
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async pushCurrentTime(serverId: number, time: number) { public async pushCurrentTime(serverId: number, time: number) {
try {
let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId); let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId);
let channel = this.channelService.getChannel(roomId, false); let channel = this.channelService.getChannel(roomId, false);
if (!channel) return { result: false, serverId }; if (!channel) return { result: false, serverId };
channel.pushMessage('onPushCurrentTime', resResult(STATUS.SUCCESS, { time })); channel.pushMessage('onPushCurrentTime', resResult(STATUS.SUCCESS, { time }));
return { result: true, serverId }; return { result: true, serverId };
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -261,49 +322,81 @@ export class ChatRemote {
* @param guildCode * @param guildCode
*/ */
public async sendGuildAuction(guildCode: string, lot: LotType) { public async sendGuildAuction(guildCode: string, lot: LotType) {
try {
let roomId = groupRoomId(CHANNEL_PREFIX.GUILD, guildCode); let roomId = groupRoomId(CHANNEL_PREFIX.GUILD, guildCode);
let channel = this.channelService.getChannel(roomId, false); let channel = this.channelService.getChannel(roomId, false);
if(!channel) return false; if(!channel) return false;
channel.pushMessage('onAuctionOver', resResult(STATUS.SUCCESS, { lot })); channel.pushMessage('onAuctionOver', resResult(STATUS.SUCCESS, { lot }));
return true; return true;
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async sendWorldAuction(serverId: number, lot: LotType) { public async sendWorldAuction(serverId: number, lot: LotType) {
try {
let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId); let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId);
let channel = this.channelService.getChannel(roomId, false); let channel = this.channelService.getChannel(roomId, false);
if(!channel) return false; if(!channel) return false;
channel.pushMessage('onAuctionOver', resResult(STATUS.SUCCESS, { lot })); channel.pushMessage('onAuctionOver', resResult(STATUS.SUCCESS, { lot }));
return true; return true;
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async sendAuctionUpdate(serverId: number, params: { lots: LotType[] }) { public async sendAuctionUpdate(serverId: number, params: { lots: LotType[] }) {
try {
let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId); let roomId = groupRoomId(CHANNEL_PREFIX.WORLD, serverId);
let channel = this.channelService.getChannel(roomId, false); let channel = this.channelService.getChannel(roomId, false);
if(!channel) return false; if(!channel) return false;
channel.pushMessage('onAuctionUpdate', resResult(STATUS.SUCCESS, params)); channel.pushMessage('onAuctionUpdate', resResult(STATUS.SUCCESS, params));
return true; return true;
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async checkFilterWords(word: string) { public async checkFilterWords(word: string) {
try {
return await _checkFilterWords(word); return await _checkFilterWords(word);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public setServerMainten(serverIds: number[], startTime: number, endTime: number) { public setServerMainten(serverIds: number[], startTime: number, endTime: number) {
try {
setServerMainten(serverIds, startTime, endTime); setServerMainten(serverIds, startTime, endTime);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public stopServerMainten(serverIds: number[]) { public stopServerMainten(serverIds: number[]) {
try {
stopServerMainten(serverIds); stopServerMainten(serverIds);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public getServerMainten(serverId: number) { public getServerMainten(serverId: number) {
try {
return getServerMainten(serverId); return getServerMainten(serverId);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public taflush() { public taflush() {
try {
return taflush(); return taflush();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
} }
@@ -11,6 +11,7 @@ import { pick } from 'underscore';
import { LotType } from '../../../db/Lot'; import { LotType } from '../../../db/Lot';
import { DividendType } from '../../../db/Dividend'; import { DividendType } from '../../../db/Dividend';
import { getRoleOnlineInfo } from '../../../services/redisService'; import { getRoleOnlineInfo } from '../../../services/redisService';
import { errlogger } from '../../../util/logger';
export default function (app: Application) { export default function (app: Application) {
new HandlerService(app, {}); new HandlerService(app, {});
@@ -130,6 +131,7 @@ export class GuildRemote {
* @param sid 玩家sid * @param sid 玩家sid
*/ */
public memberQuit(guildCode: string, roleId: string, guild: GuildType, sid?: string) { public memberQuit(guildCode: string, roleId: string, guild: GuildType, sid?: string) {
try {
// 被踢出公会 // 被踢出公会
this.pushMessageByUids(guildCode, this.MEMBER_QUIT, roleId, { this.pushMessageByUids(guildCode, this.MEMBER_QUIT, roleId, {
code: guildCode, code: guildCode,
@@ -138,6 +140,9 @@ export class GuildRemote {
// 更新人数减少 // 更新人数减少
this.updateInfo(guildCode, { memberCnt: guild.memberCnt, guildCe: guild.guildCe }); this.updateInfo(guildCode, { memberCnt: guild.memberCnt, guildCe: guild.guildCe });
leaveGuildChannel(roleId, sid, guildCode); leaveGuildChannel(roleId, sid, guildCode);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -145,10 +150,14 @@ export class GuildRemote {
* @param guildCode 军团code * @param guildCode 军团code
*/ */
public dismiss(guildCode: string) { public dismiss(guildCode: string) {
try {
let channel = this.pushMessage(guildCode, this.DISMISS, { code: guildCode }); let channel = this.pushMessage(guildCode, this.DISMISS, { code: guildCode });
if (!!channel) { if (!!channel) {
channel.destroy(); channel.destroy();
} }
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -157,7 +166,11 @@ export class GuildRemote {
* @param info 军团相关信息 * @param info 军团相关信息
*/ */
public updateInfo(guildCode: string, info: any) { public updateInfo(guildCode: string, info: any) {
try {
this.pushMessage(guildCode, this.GUILD_INFO_UPDATE, info); this.pushMessage(guildCode, this.GUILD_INFO_UPDATE, info);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -174,7 +187,7 @@ export class GuildRemote {
this.demotion(guildCode, oldLeaderId); this.demotion(guildCode, oldLeaderId);
this.promotion(guildCode, roleId); this.promotion(guildCode, roleId);
}catch(e) { }catch(e) {
console.log(e.stack) errlogger.error(`remote ${__filename} \n ${e.stack}`);
} }
} }
@@ -184,9 +197,13 @@ export class GuildRemote {
* @param roleId 旧团长id * @param roleId 旧团长id
*/ */
public demotion(guildCode: string, roleId: string) { public demotion(guildCode: string, roleId: string) {
try {
this.pushMessageByUids(guildCode, this.DEMOTION, roleId, { this.pushMessageByUids(guildCode, this.DEMOTION, roleId, {
code: guildCode code: guildCode
}); });
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -195,9 +212,13 @@ export class GuildRemote {
* @param roleId 新团长id * @param roleId 新团长id
*/ */
public promotion(guildCode: string, roleId: string) { public promotion(guildCode: string, roleId: string) {
try {
this.pushMessageByUids(guildCode, this.PROMOTION, roleId, { this.pushMessageByUids(guildCode, this.PROMOTION, roleId, {
code: guildCode code: guildCode
}); });
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -205,8 +226,12 @@ export class GuildRemote {
* @param guildRecType 动态 * @param guildRecType 动态
*/ */
public addRec(guildRecType: GuildRecType) { public addRec(guildRecType: GuildRecType) {
try {
let { guildCode, type, params, createTime } = guildRecType; let { guildCode, type, params, createTime } = guildRecType;
this.pushMessage(guildCode, this.GUILD_REC_ADD, { type, params, createTime }); this.pushMessage(guildCode, this.GUILD_REC_ADD, { type, params, createTime });
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -214,7 +239,11 @@ export class GuildRemote {
* @param guildCode * @param guildCode
*/ */
public pushGateHp(guildCode: string, gateHp: number) { public pushGateHp(guildCode: string, gateHp: number) {
try {
this.pushMessage(guildCode, this.GUILD_GATE_ACT_HP, { gateHp }); this.pushMessage(guildCode, this.GUILD_GATE_ACT_HP, { gateHp });
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -222,7 +251,11 @@ export class GuildRemote {
* @param guildCode * @param guildCode
*/ */
public pushRank(guildCode: string, msg: GuildRankParams) { public pushRank(guildCode: string, msg: GuildRankParams) {
try {
this.pushMessage(guildCode, this.GATE_ACT_RANK, msg); this.pushMessage(guildCode, this.GATE_ACT_RANK, msg);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -230,7 +263,11 @@ export class GuildRemote {
* @param guildCode * @param guildCode
*/ */
public pushCityActRank(guildCode: string, msg: GuildRankParams) { public pushCityActRank(guildCode: string, msg: GuildRankParams) {
try {
this.pushMessage(guildCode, this.CITY_ACT_RANK, msg); this.pushMessage(guildCode, this.CITY_ACT_RANK, msg);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -238,8 +275,12 @@ export class GuildRemote {
* @param guildCode * @param guildCode
*/ */
public async sendGuildActivityEnd(guildCode: string) { public async sendGuildActivityEnd(guildCode: string) {
try {
console.log("MSG END") console.log("MSG END")
this.pushMessage(guildCode, this.GUILD_ACTIVITY_END, {}); this.pushMessage(guildCode, this.GUILD_ACTIVITY_END, {});
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -249,6 +290,7 @@ export class GuildRemote {
* @param declareCount 宣战数量 * @param declareCount 宣战数量
*/ */
public async sendGuildCityDeclare(cityId: number, declareGuildCode: string, declareCount: number) { public async sendGuildCityDeclare(cityId: number, declareGuildCode: string, declareCount: number) {
try {
this.pushMessageToCity(cityId, this.GUILD_CITY_DECLARE, { this.pushMessageToCity(cityId, this.GUILD_CITY_DECLARE, {
cityId, cityId,
declareGuildCode, declareGuildCode,
@@ -259,6 +301,9 @@ export class GuildRemote {
declareGuildCode, declareGuildCode,
declareCount declareCount
}); });
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -267,10 +312,14 @@ export class GuildRemote {
* @param gateHp 血条 * @param gateHp 血条
*/ */
public async pushCityGateHp(cityId: number, gateHp: number) { public async pushCityGateHp(cityId: number, gateHp: number) {
try {
this.pushMessageToCity(cityId, this.GUILD_CITY_ACT_HP, { this.pushMessageToCity(cityId, this.GUILD_CITY_ACT_HP, {
cityId, cityId,
gateHp gateHp
}); });
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -280,12 +329,16 @@ export class GuildRemote {
* @param ranks 军团排名和自己所在的排名 * @param ranks 军团排名和自己所在的排名
*/ */
public async pushRaceHorseUpdate(guildCode: string, woodenHorseList: WoodenHorse[], ranks: GuildRankParams, events: Event[]) { public async pushRaceHorseUpdate(guildCode: string, woodenHorseList: WoodenHorse[], ranks: GuildRankParams, events: Event[]) {
try {
this.pushMessage(guildCode, this.GUILD_RACE_UPDATE, { this.pushMessage(guildCode, this.GUILD_RACE_UPDATE, {
timestamp: Date.now(), timestamp: Date.now(),
woodenHorseList, woodenHorseList,
...ranks, ...ranks,
events events
}); });
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
@@ -295,10 +348,14 @@ export class GuildRemote {
* @param woodenHorse 木马 * @param woodenHorse 木马
*/ */
public async pushRaceHorseJoin(guildCode: string, woodenHorse: WoodenHorse) { public async pushRaceHorseJoin(guildCode: string, woodenHorse: WoodenHorse) {
try {
this.pushMessage(guildCode, this.GUILD_RACE_JOIN, { this.pushMessage(guildCode, this.GUILD_RACE_JOIN, {
timestamp: Date.now(), timestamp: Date.now(),
woodenHorse woodenHorse
}); });
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -306,7 +363,11 @@ export class GuildRemote {
* @param guildCode * @param guildCode
*/ */
public async sendRaceEvent(guildCode: string, events: Event[]) { public async sendRaceEvent(guildCode: string, events: Event[]) {
try {
this.pushMessage(guildCode, this.GUILD_RACE_EVENT, { timestamp: Date.now(), events }); this.pushMessage(guildCode, this.GUILD_RACE_EVENT, { timestamp: Date.now(), events });
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -317,7 +378,11 @@ export class GuildRemote {
* @param status * @param status
*/ */
public async pushBossStatus(guildCode: string, result: any) { public async pushBossStatus(guildCode: string, result: any) {
try {
this.pushMessage(guildCode, this.GUILD_BOSS_OPEN, pick(result, ['status', 'bossInfo', 'leaderOpenCnt'])); this.pushMessage(guildCode, this.GUILD_BOSS_OPEN, pick(result, ['status', 'bossInfo', 'leaderOpenCnt']));
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -325,8 +390,12 @@ export class GuildRemote {
* @param guildCode * @param guildCode
*/ */
public async sendPopUpActivity(guildCode: string, data: any[]) { public async sendPopUpActivity(guildCode: string, data: any[]) {
try {
console.log("sendPopUpActivity") console.log("sendPopUpActivity")
this.pushMessage(guildCode, this.GUILD_POP_UP_ACTIVITY, data); this.pushMessage(guildCode, this.GUILD_POP_UP_ACTIVITY, data);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -336,24 +405,44 @@ export class GuildRemote {
* @param data 军团内容 * @param data 军团内容
*/ */
public async sendMailToGuild(guildCode: string, path: string, data: { mails: MailParam[] }) { public async sendMailToGuild(guildCode: string, path: string, data: { mails: MailParam[] }) {
try {
this.pushMessage(guildCode, path, data); this.pushMessage(guildCode, path, data);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async sendTrainReset(guildCode: string) { public async sendTrainReset(guildCode: string) {
try {
this.pushMessage(guildCode, this.GUILD_TRAIN_RESET, {}); this.pushMessage(guildCode, this.GUILD_TRAIN_RESET, {});
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async pushEncourage(guildCode: string, param: {encourageCnt: number; encourageMax: number; myEncourageCnt: number;}) { public async pushEncourage(guildCode: string, param: {encourageCnt: number; encourageMax: number; myEncourageCnt: number;}) {
try {
this.pushMessage(guildCode, this.GUILD_BOSS_ENCOURAGE, param); this.pushMessage(guildCode, this.GUILD_BOSS_ENCOURAGE, param);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async pushAuctionUpdate(guildCode: string, param: { lots: LotType[]; dividends: DividendType[] }) { public async pushAuctionUpdate(guildCode: string, param: { lots: LotType[]; dividends: DividendType[] }) {
try {
if(param.lots) this.pushMessage(guildCode, this.AUCTION_UPDATE, { lots: param.lots }); if(param.lots) this.pushMessage(guildCode, this.AUCTION_UPDATE, { lots: param.lots });
if(param.dividends) this.pushMessage(guildCode, this.DIVIDEND_UPDATE, { dividends: param.dividends }); if(param.dividends) this.pushMessage(guildCode, this.DIVIDEND_UPDATE, { dividends: param.dividends });
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async pushAuctionAdd(guildCode: string, param: { lots: LotType[]; dividends: DividendType[] }) { public async pushAuctionAdd(guildCode: string, param: { lots: LotType[]; dividends: DividendType[] }) {
try {
if(param.lots) this.pushMessage(guildCode, this.AUCTION_ADD, { lots: param.lots }); if(param.lots) this.pushMessage(guildCode, this.AUCTION_ADD, { lots: param.lots });
if(param.dividends) this.pushMessage(guildCode, this.DIVIDEND_ADD, { dividends: param.dividends }); if(param.dividends) this.pushMessage(guildCode, this.DIVIDEND_ADD, { dividends: param.dividends });
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
} }
@@ -8,6 +8,7 @@ import { PVPConfigModel, PVPConfigType } from '../../../db/SystemConfig';
import { setDicAuctionTime } from '../../../services/guildActivityService'; import { setDicAuctionTime } from '../../../services/guildActivityService';
import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService'; import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService';
import { taflush } from '../../../services/sdkService'; import { taflush } from '../../../services/sdkService';
import { errlogger } from '../../../util/logger';
export default function (app: Application) { export default function (app: Application) {
new HandlerService(app, {}); new HandlerService(app, {});
return new ConnectorRemote(app); return new ConnectorRemote(app);
@@ -21,10 +22,15 @@ export class ConnectorRemote {
} }
public async remoteLogin(uid: string, message?: any) { public async remoteLogin(uid: string, message?: any) {
try {
await kickUser(this.app, uid, message); await kickUser(this.app, uid, message);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async setOtherUserGuildSession(params: { roleId: string, userGuild: UserGuildType}[]) { public async setOtherUserGuildSession(params: { roleId: string, userGuild: UserGuildType}[]) {
try {
let sessionService = this.app.get('sessionService'); let sessionService = this.app.get('sessionService');
for(let {roleId, userGuild} of params) { for(let {roleId, userGuild} of params) {
let sessions = sessionService.getByUid(roleId); let sessions = sessionService.getByUid(roleId);
@@ -38,9 +44,13 @@ export class ConnectorRemote {
}) })
} }
} }
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async setOtherUserRoleNameSession(params: { roleId: string, roleName: string}[]) { public async setOtherUserRoleNameSession(params: { roleId: string, roleName: string}[]) {
try {
let sessionService = this.app.get('sessionService'); let sessionService = this.app.get('sessionService');
for(let {roleId, roleName} of params) { for(let {roleId, roleName} of params) {
let sessions = sessionService.getByUid(roleId); let sessions = sessionService.getByUid(roleId);
@@ -50,9 +60,13 @@ export class ConnectorRemote {
}); });
} }
} }
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async setOtherUseBlockTypeSession(params: { roleId: string, blockType: string}[]) { public async setOtherUseBlockTypeSession(params: { roleId: string, blockType: string}[]) {
try {
let sessionService = this.app.get('sessionService'); let sessionService = this.app.get('sessionService');
for(let {roleId, blockType} of params) { for(let {roleId, blockType} of params) {
let sessions = sessionService.getByUid(roleId); let sessions = sessionService.getByUid(roleId);
@@ -62,47 +76,82 @@ export class ConnectorRemote {
}); });
} }
} }
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
* 重载json资源 * 重载json资源
*/ */
public async reloadResources() { public async reloadResources() {
try {
reloadResources(); reloadResources();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public setServerMainten(serverIds: number[], startTime: number, endTime: number) { public setServerMainten(serverIds: number[], startTime: number, endTime: number) {
try {
setServerMainten(serverIds, startTime, endTime); setServerMainten(serverIds, startTime, endTime);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public stopServerMainten(serverIds: number[]) { public stopServerMainten(serverIds: number[]) {
try {
stopServerMainten(serverIds); stopServerMainten(serverIds);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public getServerMainten(serverId: number) { public getServerMainten(serverId: number) {
try {
return getServerMainten(serverId); return getServerMainten(serverId);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public setPvpSeasonNum(pvpConfig: PVPConfigType) { public setPvpSeasonNum(pvpConfig: PVPConfigType) {
try {
if(pvpConfig) { if(pvpConfig) {
this.app.set('pvpSeasonNum', pvpConfig.seasonNum); this.app.set('pvpSeasonNum', pvpConfig.seasonNum);
this.app.set('pvpSeasonEndTime', pvpConfig.seasonEndTime); this.app.set('pvpSeasonEndTime', pvpConfig.seasonEndTime);
} }
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async initPvpSeasonNum() { public async initPvpSeasonNum() {
try {
let pvpConfig = await PVPConfigModel.findCurPVPConfig(); let pvpConfig = await PVPConfigModel.findCurPVPConfig();
this.setPvpSeasonNum(pvpConfig); this.setPvpSeasonNum(pvpConfig);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
* 改变字典表中的拍卖行时间 * 改变字典表中的拍卖行时间
*/ */
async setDicAuctionTime(startTime: number, endActivity: number, startGuild: number, endGuild: number, startWorld: number, endWorld: number) { async setDicAuctionTime(startTime: number, endActivity: number, startGuild: number, endGuild: number, startWorld: number, endWorld: number) {
try {
setDicAuctionTime(startTime, endActivity, startGuild, endGuild, startWorld, endWorld); setDicAuctionTime(startTime, endActivity, startGuild, endGuild, startWorld, endWorld);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public taflush() { public taflush() {
try {
return taflush(); return taflush();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
} }
@@ -3,6 +3,7 @@ import { sendAllGuildRanks, sendGuildActEndMsg, calWoodenHorseAndSend, sendRaceS
import { gameData } from '../../../pubUtils/data'; import { gameData } from '../../../pubUtils/data';
import { setWeek } from '../../../pubUtils/timeUtil'; import { setWeek } from '../../../pubUtils/timeUtil';
import { sendUngotDividend } from '../../../services/auctionService'; import { sendUngotDividend } from '../../../services/auctionService';
import { errlogger } from '../../../util/logger';
export default function (app: Application) { export default function (app: Application) {
new HandlerService(app, {}); new HandlerService(app, {});
@@ -24,34 +25,51 @@ export class GuildActivityRemote {
* 从systimer服分发到guild各个服,发送排行榜数据 * 从systimer服分发到guild各个服,发送排行榜数据
*/ */
public async sendRankToGuilds(aid: number) { public async sendRankToGuilds(aid: number) {
try {
await sendAllGuildRanks(aid); await sendAllGuildRanks(aid);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
* 发送结束活动消息 * 发送结束活动消息
*/ */
public async guildActivityEnd(aid: number) { public async guildActivityEnd(aid: number) {
try {
await sendGuildActEndMsg(aid); await sendGuildActEndMsg(aid);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
* 计算粮草先行木马状态并发送 * 计算粮草先行木马状态并发送
*/ */
public async calWoodenHorseAndSend(serverId: number) { public async calWoodenHorseAndSend(serverId: number) {
try {
await calWoodenHorseAndSend(serverId); await calWoodenHorseAndSend(serverId);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
* 发送粮草先行活动开始通知 * 发送粮草先行活动开始通知
*/ */
async raceActivityStart(serverId: number) { async raceActivityStart(serverId: number) {
try {
await sendRaceStartMsg(serverId); await sendRaceStartMsg(serverId);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
* !! 注意,这条函数会改变内存中的字典表,影响甚大,请考虑清楚后使用 * !! 注意,这条函数会改变内存中的字典表,影响甚大,请考虑清楚后使用
*/ */
async updateGuildActivityData(aid: number, isStart: boolean) { async updateGuildActivityData(aid: number, isStart: boolean) {
try {
let guildActivity = gameData.guildActivity; let guildActivity = gameData.guildActivity;
let cur = guildActivity.get(aid); let cur = guildActivity.get(aid);
@@ -66,6 +84,9 @@ export class GuildActivityRemote {
cur.startTime = now.getHours(); cur.startTime = now.getHours();
cur.startSeconds = now.getSeconds(); cur.startSeconds = now.getSeconds();
} }
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -75,33 +96,57 @@ export class GuildActivityRemote {
* @param {number} endSeconds 从开始之后几秒后结束活动 * @param {number} endSeconds 从开始之后几秒后结束活动
*/ */
async setDicGuildActivity(now: number, aid: number, startSeconds: number, endSeconds: number) { async setDicGuildActivity(now: number, aid: number, startSeconds: number, endSeconds: number) {
try {
return setDicGuildActivity(now, aid, startSeconds, endSeconds); return setDicGuildActivity(now, aid, startSeconds, endSeconds);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
* 改变字典表中的拍卖行时间 * 改变字典表中的拍卖行时间
*/ */
async setDicAuctionTime(startTime: number, endActivity: number, startGuild: number, endGuild: number, startWorld: number, endWorld: number) { async setDicAuctionTime(startTime: number, endActivity: number, startGuild: number, endGuild: number, startWorld: number, endWorld: number) {
try {
setDicAuctionTime(startTime, endActivity, startGuild, endGuild, startWorld, endWorld); setDicAuctionTime(startTime, endActivity, startGuild, endGuild, startWorld, endWorld);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
* !! 注意,这条函数会改变内存时间,影响甚大,请考虑清楚后使用 * !! 注意,这条函数会改变内存时间,影响甚大,请考虑清楚后使用
*/ */
async setDay(week: number) { async setDay(week: number) {
try {
setWeek(week); setWeek(week);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
setCurrentTime(time: number) { setCurrentTime(time: number) {
try {
this.currentTime = time; this.currentTime = time;
this.setTime = Date.now(); this.setTime = Date.now();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
getCurrentTime() { getCurrentTime() {
try {
return Date.now() - this.setTime + this.currentTime; return Date.now() - this.setTime + this.currentTime;
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async sendUngotDividend() { public async sendUngotDividend() {
try {
await sendUngotDividend(); await sendUngotDividend();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
} }
@@ -2,6 +2,7 @@ import { Application, ChannelService, HandlerService, } from 'pinus';
import { reloadResources } from '../../../pubUtils/data'; import { reloadResources } from '../../../pubUtils/data';
import { taflush, treatGuildName } from '../../../services/sdkService'; import { taflush, treatGuildName } from '../../../services/sdkService';
import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService'; import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService';
import { errlogger } from '../../../util/logger';
export default function (app: Application) { export default function (app: Application) {
new HandlerService(app, {}); new HandlerService(app, {});
@@ -21,26 +22,50 @@ export class GuildRemote {
* 重载json资源 * 重载json资源
*/ */
public async reloadResources() { public async reloadResources() {
try {
reloadResources(); reloadResources();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async treatGuildName(content: string) { public async treatGuildName(content: string) {
try {
await treatGuildName(content); await treatGuildName(content);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public setServerMainten(serverIds: number[], startTime: number, endTime: number) { public setServerMainten(serverIds: number[], startTime: number, endTime: number) {
try {
setServerMainten(serverIds, startTime, endTime); setServerMainten(serverIds, startTime, endTime);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public stopServerMainten(serverIds: number[]) { public stopServerMainten(serverIds: number[]) {
try {
stopServerMainten(serverIds); stopServerMainten(serverIds);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public getServerMainten(serverId: number) { public getServerMainten(serverId: number) {
try {
return getServerMainten(serverId); return getServerMainten(serverId);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public taflush() { public taflush() {
try {
return taflush(); return taflush();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
} }
@@ -3,6 +3,7 @@ import { reloadResources } from '../../../pubUtils/data';
import { settleOrderFromRedisPub } from '../../../services/orderService'; import { settleOrderFromRedisPub } from '../../../services/orderService';
import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService'; import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService';
import { taflush } from '../../../services/sdkService'; import { taflush } from '../../../services/sdkService';
import { errlogger } from '../../../util/logger';
export default function (app: Application) { export default function (app: Application) {
new HandlerService(app, {}); new HandlerService(app, {});
@@ -22,26 +23,50 @@ export class OrderRemote {
* 重载json资源 * 重载json资源
*/ */
public async reloadResources() { public async reloadResources() {
try {
reloadResources(); reloadResources();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async settleOrderFromRedisPub(message: string) { public async settleOrderFromRedisPub(message: string) {
try {
await settleOrderFromRedisPub(message); await settleOrderFromRedisPub(message);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public setServerMainten(serverIds: number[], startTime: number, endTime: number) { public setServerMainten(serverIds: number[], startTime: number, endTime: number) {
try {
setServerMainten(serverIds, startTime, endTime); setServerMainten(serverIds, startTime, endTime);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public stopServerMainten(serverIds: number[]) { public stopServerMainten(serverIds: number[]) {
try {
stopServerMainten(serverIds); stopServerMainten(serverIds);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public getServerMainten(serverId: number) { public getServerMainten(serverId: number) {
try {
return getServerMainten(serverId); return getServerMainten(serverId);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public taflush() { public taflush() {
try {
return taflush(); return taflush();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
} }
@@ -12,6 +12,7 @@ import { getDefaultRoleInfo } from '../../../services/roleService';
import { PVPConfigModel, PVPConfigType } from '../../../db/SystemConfig'; import { PVPConfigModel, PVPConfigType } from '../../../db/SystemConfig';
import { treatRoleName, taflush } from '../../../services/sdkService'; import { treatRoleName, taflush } from '../../../services/sdkService';
import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService'; import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService';
import { errlogger } from '../../../util/logger';
export default function (app: Application) { export default function (app: Application) {
new HandlerService(app, {}); new HandlerService(app, {});
@@ -46,19 +47,29 @@ export class RoleRemote {
} }
public setRankFirst(rank: RankFirstType) { public setRankFirst(rank: RankFirstType) {
try {
// console.log('****** setRankFirst', rank.serverId, rank.id, rank) // console.log('****** setRankFirst', rank.serverId, rank.id, rank)
if(!this.rankFirstRewards.has(rank.serverId)) { if(!this.rankFirstRewards.has(rank.serverId)) {
this.rankFirstRewards.set(rank.serverId, new Map()); this.rankFirstRewards.set(rank.serverId, new Map());
} }
this.rankFirstRewards.get(rank.serverId).set(rank.id, rank); this.rankFirstRewards.get(rank.serverId).set(rank.id, rank);
this.app.set('rankFirstRewards', this.rankFirstRewards); this.app.set('rankFirstRewards', this.rankFirstRewards);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public getRankFirstById(serverId: number, id: number) { public getRankFirstById(serverId: number, id: number) {
try {
return this.rankFirstRewards.get(serverId)?.get(id); return this.rankFirstRewards.get(serverId)?.get(id);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public setInitRole() { public setInitRole() {
try {
let result = getInitRoleInfo(); let result = getInitRoleInfo();
let { role, heroes, skins, figureInfo } = result; let { role, heroes, skins, figureInfo } = result;
for(let hero of heroes) { for(let hero of heroes) {
@@ -73,38 +84,57 @@ export class RoleRemote {
this.app.set('initRoleInfos', initRoleInfos); this.app.set('initRoleInfos', initRoleInfos);
this.app.set('initHeroes', this.initHeroes); this.app.set('initHeroes', this.initHeroes);
this.app.set('initSkins', this.initSkins); this.app.set('initSkins', this.initSkins);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public getInitRoleInfos() { public getInitRoleInfos() {
try {
let initRoleInfos = this.app.get('initRoleInfos'); let initRoleInfos = this.app.get('initRoleInfos');
if (!initRoleInfos) { if (!initRoleInfos) {
initRoleInfos = getDefaultRoleInfo(this.initHeroes, this.initSkins, this.initRole, this.figureInfo); initRoleInfos = getDefaultRoleInfo(this.initHeroes, this.initSkins, this.initRole, this.figureInfo);
this.app.set('initRoleInfos', initRoleInfos); this.app.set('initRoleInfos', initRoleInfos);
} }
return initRoleInfos; return initRoleInfos;
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public getInitHeroes() { public getInitHeroes() {
try {
let result: HeroUpdate[] = []; let result: HeroUpdate[] = [];
for(let hid of DEFAULT_HEROES) { for(let hid of DEFAULT_HEROES) {
result.push(this.initHeroes.get(hid)); result.push(this.initHeroes.get(hid));
} }
return result; return result;
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public getInitSkins() { public getInitSkins() {
try {
let result: SkinUpdate[] = []; let result: SkinUpdate[] = [];
for(let hid of DEFAULT_HEROES) { for(let hid of DEFAULT_HEROES) {
result.push(this.initSkins.get(hid)); result.push(this.initSkins.get(hid));
} }
return result; return result;
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public getInitHeroById(hid: number) { public getInitHeroById(hid: number) {
try {
return { return {
heroInfo: this.initHeroes.get(hid), heroInfo: this.initHeroes.get(hid),
skinInfo: this.initSkins.get(hid) skinInfo: this.initSkins.get(hid)
} }
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
@@ -112,39 +142,71 @@ export class RoleRemote {
* 重载json资源 * 重载json资源
*/ */
public async reloadResources() { public async reloadResources() {
try {
reloadResources(); reloadResources();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public setPvpSeasonNum(pvpConfig: PVPConfigType) { public setPvpSeasonNum(pvpConfig: PVPConfigType) {
try {
if(pvpConfig) { if(pvpConfig) {
this.app.set('pvpSeasonNum', pvpConfig.seasonNum); this.app.set('pvpSeasonNum', pvpConfig.seasonNum);
this.app.set('pvpSeasonEndTime', pvpConfig.seasonEndTime); this.app.set('pvpSeasonEndTime', pvpConfig.seasonEndTime);
} }
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async initPvpSeasonNum() { public async initPvpSeasonNum() {
try {
let pvpConfig = await PVPConfigModel.findCurPVPConfig(); let pvpConfig = await PVPConfigModel.findCurPVPConfig();
this.setPvpSeasonNum(pvpConfig); this.setPvpSeasonNum(pvpConfig);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async treatRoleName(roleId: string) { public async treatRoleName(roleId: string) {
try {
await treatRoleName(roleId); await treatRoleName(roleId);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public setServerMainten(serverIds: number[], startTime: number, endTime: number) { public setServerMainten(serverIds: number[], startTime: number, endTime: number) {
try {
setServerMainten(serverIds, startTime, endTime); setServerMainten(serverIds, startTime, endTime);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public stopServerMainten(serverIds: number[]) { public stopServerMainten(serverIds: number[]) {
try {
stopServerMainten(serverIds); stopServerMainten(serverIds);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public getServerMainten(serverId: number) { public getServerMainten(serverId: number) {
try {
return getServerMainten(serverId); return getServerMainten(serverId);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public taflush() { public taflush() {
try {
return taflush(); return taflush();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
} }
@@ -10,6 +10,7 @@ import { ServerlistType } from '../../../db/Serverlist';
import { MarqueeType } from '../../../db/Marquee'; import { MarqueeType } from '../../../db/Marquee';
import { taflush } from '../../../services/sdkService'; import { taflush } from '../../../services/sdkService';
import { RegionType } from '../../../db/Region'; import { RegionType } from '../../../db/Region';
import { errlogger } from '../../../util/logger';
export default function (app: Application) { export default function (app: Application) {
return new SystimerRemote(app); return new SystimerRemote(app);
@@ -24,30 +25,54 @@ export class SystimerRemote {
private channelService: ChannelService; private channelService: ChannelService;
public async resetPvpSeasonTime(day: number) { public async resetPvpSeasonTime(day: number) {
try {
return await resetPvpSeasonTime(day); return await resetPvpSeasonTime(day);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async guildActivityStart(dicGuildActivity: DicGuildActivity) { public async guildActivityStart(dicGuildActivity: DicGuildActivity) {
try {
return await guildActivityStart(dicGuildActivity); return await guildActivityStart(dicGuildActivity);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async gateActivityEnd() { public async gateActivityEnd() {
try {
return await gateActivityEnd(); return await gateActivityEnd();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async cityActivityEnd() { public async cityActivityEnd() {
try {
return await cityActivityEnd(); return await cityActivityEnd();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async raceActivityEnd() { public async raceActivityEnd() {
try {
return await raceActivityEnd(); return await raceActivityEnd();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
* 重载json资源 * 重载json资源
*/ */
public async reloadResources() { public async reloadResources() {
try {
reloadResources(); reloadResources();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -55,11 +80,19 @@ export class SystimerRemote {
* @param code 跑马灯唯一code * @param code 跑马灯唯一code
*/ */
public async setMarquee(marquee: MarqueeType) { public async setMarquee(marquee: MarqueeType) {
try {
return await setMarquee(marquee); return await setMarquee(marquee);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async cancelMarquee(code: string) { public async cancelMarquee(code: string) {
try {
return await cancelMarquee(code); return await cancelMarquee(code);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
@@ -69,44 +102,80 @@ export class SystimerRemote {
* @param {number} endSeconds 从开始之后几秒后结束活动 * @param {number} endSeconds 从开始之后几秒后结束活动
*/ */
public async setDicGuildActivity(now: number, aid: number, startSeconds: number, endSeconds: number) { public async setDicGuildActivity(now: number, aid: number, startSeconds: number, endSeconds: number) {
try {
setDicGuildActivity(now, aid, startSeconds, endSeconds); setDicGuildActivity(now, aid, startSeconds, endSeconds);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
* 改变字典表中的拍卖行时间 * 改变字典表中的拍卖行时间
*/ */
public async setDicAuctionTime(startTime: number, endActivity: number, startGuild: number, endGuild: number, startWorld: number, endWorld: number) { public async setDicAuctionTime(startTime: number, endActivity: number, startGuild: number, endGuild: number, startWorld: number, endWorld: number) {
try {
setDicAuctionTime(startTime, endActivity, startGuild, endGuild, startWorld, endWorld); setDicAuctionTime(startTime, endActivity, startGuild, endGuild, startWorld, endWorld);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async setGuildActivitySchedule() { public async setGuildActivitySchedule() {
try {
await guildActivitySchedule(); await guildActivitySchedule();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async setAuctionSchedule() { public async setAuctionSchedule() {
try {
auctionSchedule(); auctionSchedule();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
/** /**
* !! 注意,这条函数会改变内存时间,影响甚大,请考虑清楚后使用 * !! 注意,这条函数会改变内存时间,影响甚大,请考虑清楚后使用
*/ */
async setDay(week: number) { async setDay(week: number) {
try {
setWeek(week); setWeek(week);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async initMaintenance(servers?: ServerlistType[]) { public async initMaintenance(servers?: ServerlistType[]) {
try {
await initMaintenance(servers); await initMaintenance(servers);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public async stopMaintenance(batchCode: string, serverIds: number[]) { public async stopMaintenance(batchCode: string, serverIds: number[]) {
try {
await stopMaintenance(batchCode, serverIds); await stopMaintenance(batchCode, serverIds);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public taflush() { public taflush() {
try {
return taflush(); return taflush();
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
public initAutoCreateServer(region: RegionType) { public initAutoCreateServer(region: RegionType) {
try {
return initAutoCreateServer(region); return initAutoCreateServer(region);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}
} }
} }