From f15b6319e39f75383a7ed2716f4b52d5419ccdd1 Mon Sep 17 00:00:00 2001 From: luying Date: Fri, 7 Jan 2022 18:55:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=EF=BC=9A=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BF=9D=E5=AD=98=E6=95=B0=E9=87=8F=E3=80=81?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/servers/connector/filter/global.ts | 4 +- game-server/channelService.js | 522 ++++++++++++++++++ game-server/config/sq1/log4js.ts | 10 +- game-server/pm2Starter.sh | 3 +- game-server/pm2StarterDistribute.sh | 1 + shared/pubUtils/dicParam.ts | 2 +- 6 files changed, 533 insertions(+), 9 deletions(-) create mode 100644 game-server/channelService.js diff --git a/game-server/app/servers/connector/filter/global.ts b/game-server/app/servers/connector/filter/global.ts index 63702fbec..1838ec1c1 100644 --- a/game-server/app/servers/connector/filter/global.ts +++ b/game-server/app/servers/connector/filter/global.ts @@ -8,7 +8,7 @@ import { UserModel } from "../../../db/User"; import { SERVER_DEBUG_MODE } from "../../../pubUtils/dicParam"; import { nowSeconds } from "../../../pubUtils/timeUtil"; import { getServerMainten } from "../../../services/gmService"; -import { errlogger } from "../../../util/logger"; +// import { errlogger } from "../../../util/logger"; export function globalFilter(app: Application) { return new Filter(app); } @@ -32,7 +32,7 @@ Filter.prototype.before = async function (routeRecord: RouteRecord, msg: any, se if(this.accessTime && this.accessTime.has(keyOfRouteWithUser)) { console.log(this.accessTime.get(keyOfRouteWithUser) - Date.now()); if(Date.now() - this.accessTime.get(keyOfRouteWithUser) < ACCESS_FREQUENCY) { - errlogger.error(`${keyOfRouteWithUser} 间隔时间小于${ACCESS_FREQUENCY}ms，为 ${Date.now() - this.accessTime.get(keyOfRouteWithUser)}`); + // errlogger.error(`${keyOfRouteWithUser} 间隔时间小于${ACCESS_FREQUENCY}ms，为 ${Date.now() - this.accessTime.get(keyOfRouteWithUser)}`); // return next(new Error(), resResult(STATUS.ACCESS_BUSY)); } } diff --git a/game-server/channelService.js b/game-server/channelService.js new file mode 100644 index 000000000..e3d51dcd0 --- /dev/null +++ b/game-server/channelService.js @@ -0,0 +1,522 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +const countDownLatch = require("../../util/countDownLatch"); +const utils = require("../../util/utils"); +const channelRemote_1 = require("../remote/frontend/channelRemote"); +const pinus_logger_1 = require("pinus-logger"); +const path = require("path"); +let logger = pinus_logger_1.getLogger('pinus', path.basename(__filename)); +let infoLogger = pinus_logger_1.getLogger('info', path.basename(__filename)); +/** + * constant + */ +let ST_INITED = 0; +let ST_DESTROYED = 1; +/** + * Create and maintain channels for server local. + * + * ChannelService is created by channel component which is a default loaded + * component of pinus and channel service would be accessed by `app.get('channelService')`. + * + * @class + * @constructor + */ +class ChannelService { + constructor(app, opts) { + this.apushMessageByUids = utils.promisify(this.pushMessageByUids); + this.abroadcast = utils.promisify(this.broadcast); + opts = opts || {}; + this.app = app; + this.channels = {}; + this.prefix = opts.prefix; + this.store = opts.store; + this.broadcastFilter = opts.broadcastFilter; + this.channelRemote = new channelRemote_1.ChannelRemote(app); + } + start(cb) { + restoreChannel(this, cb); + } + /** + * Create channel with name. + * + * @param {String} name channel's name + * @memberOf ChannelService + */ + createChannel(name) { + if (this.channels[name]) { + return this.channels[name]; + } + let c = new Channel(name, this); + addToStore(this, genKey(this), genKey(this, name)); + this.channels[name] = c; + return c; + } + /** + * Get channel by name. + * + * @param {String} name channel's name + * @param {Boolean} create if true, create channel + * @return {Channel} + * @memberOf ChannelService + */ + getChannel(name, create) { + let channel = this.channels[name]; + if (!channel && !!create) { + channel = this.channels[name] = new Channel(name, this); + addToStore(this, genKey(this), genKey(this, name)); + } + return channel; + } + /** + * Destroy channel by name. + * + * @param {String} name channel name + * @memberOf ChannelService + */ + destroyChannel(name) { + delete this.channels[name]; + removeFromStore(this, genKey(this), genKey(this, name)); + removeAllFromStore(this, genKey(this, name)); + } + pushMessageByUids(route, msg, uids, opts, cb) { + if (typeof route !== 'string') { + cb = opts; + opts = uids; + uids = msg; + msg = route; + route = msg.route; + } + if (!cb && typeof opts === 'function') { + cb = opts; + opts = {}; + } + if (!uids || uids.length === 0) { + utils.invokeCallback(cb, new Error('uids should not be empty')); + return; + } + let groups = {}, record; + for (let i = 0, l = uids.length; i < l; i++) { + record = uids[i]; + add(record.uid, record.sid, groups); + } + sendMessageByGroup(this, route, msg, groups, opts, cb); + } + broadcast(stype, route, msg, opts, cb) { + let app = this.app; + let namespace = 'sys'; + let service = 'channelRemote'; + let method = 'broadcast'; + let servers = app.getServersByType(stype); + if (!servers || servers.length === 0) { + // server list is empty + utils.invokeCallback(cb); + return; + } + if (!cb && typeof opts === 'function') { + cb = opts; + opts = undefined; + } + let count = servers.length; + let successFlag = false; + let latch = countDownLatch.createCountDownLatch(count, function () { + if (!successFlag) { + utils.invokeCallback(cb, new Error('broadcast fails')); + return; + } + utils.invokeCallback(cb, null); + }); + let genCB = function (serverId) { + return function (err) { + if (err) { + logger.error('[broadcast] fail to push message to serverId: ' + serverId + ', err:' + err.stack); + infoLogger.error('[broadcast] fail to push message to serverId: ' + serverId + ', err:' + err.stack); + latch.done(); + return; + } + successFlag = true; + latch.done(); + }; + }; + opts = { type: 'broadcast', userOptions: opts || {} }; + // for compatiblity + opts.isBroadcast = true; + if (opts.userOptions) { + opts.binded = opts.userOptions.binded; + opts.filterParam = opts.userOptions.filterParam; + } + let self = this; + let sendMessage = function (serverId) { + return (function () { + if (serverId === app.serverId) { + self.channelRemote[method](route, msg, opts).then(() => genCB(serverId)(null)).catch((err) => genCB(serverId)(err)); + } + else { + app.rpcInvoke(serverId, { + namespace: namespace, service: service, + method: method, args: [route, msg, opts] + }, genCB(serverId)); + } + }()); + }; + for (let i = 0, l = count; i < l; i++) { + sendMessage(servers[i].id); + } + } +} +exports.ChannelService = ChannelService; +/** + * Channel maintains the receiver collection for a subject. You can + * add users into a channel and then broadcast message to them by channel. + * + * @class channel + * @constructor + */ +class Channel { + constructor(name, service) { + this.apushMessage = utils.promisify(this.pushMessage); + this.name = name; + this.groups = {}; // group map for uids. key: sid, value: [uid] + this.records = {}; // member records. key: uid + this.__channelService__ = service; + this.state = ST_INITED; + this.userAmount = 0; + } + /** + * Add user to channel. + * + * @param {Number} uid user id + * @param {String} sid frontend server id which user has connected to + */ + add(uid, sid) { + if (this.state > ST_INITED) { + return false; + } + else { + let res = add(uid, sid, this.groups); + if (res) { + this.records[uid] = { sid: sid, uid: uid }; + this.userAmount = this.userAmount + 1; + addToStore(this.__channelService__, genKey(this.__channelService__, this.name), genValue(sid, uid)); + } + return res; + } + } + /** + * Remove user from channel. + * + * @param {Number} uid user id + * @param {String} sid frontend server id which user has connected to. + * @return [Boolean] true if success or false if fail + */ + leave(uid, sid) { + if (!uid || !sid) { + return false; + } + let res = deleteFrom(uid, sid, this.groups[sid]); + if (res) { + delete this.records[uid]; + this.userAmount = this.userAmount - 1; + removeFromStore(this.__channelService__, genKey(this.__channelService__, this.name), genValue(sid, uid)); + } + if (this.userAmount < 0) + this.userAmount = 0; // robust + if (this.groups[sid] && this.groups[sid].length === 0) { + delete this.groups[sid]; + } + return res; + } + /** + * Get channel UserAmount in a channel. + * + * @return {number } channel member amount + */ + getUserAmount() { + return this.userAmount; + } + /** + * Get channel members. + * + * Notice: Heavy operation. + * + * @return {Array} channel member uid list + */ + getMembers() { + let res = [], groups = this.groups; + let group, i, l; + for (let sid in groups) { + group = groups[sid]; + for (i = 0, l = group.length; i < l; i++) { + res.push(group[i]); + } + } + return res; + } + /** + * Get Member info. + * + * @param {String} uid user id + * @return {Object} member info + */ + getMember(uid) { + return this.records[uid]; + } + /** + * Remove member by uid + * @param uid member to removed + */ + removeMember(uid) { + let member = this.getMember(uid); + if (member) + return this.leave(member.uid, member.sid); + else + return false; + } + /** + * Destroy channel. + */ + destroy() { + this.state = ST_DESTROYED; + this.__channelService__.destroyChannel(this.name); + } + /** + * Push message to all the members in the channel + * + * @param {String} route message route + * @param {Object} msg message that would be sent to client + * @param {Object} opts user-defined push options, optional + * @param {Function} cb callback function + */ + pushMessage(route, msg, opts, cb) { + if (this.state !== ST_INITED) { + utils.invokeCallback(cb, new Error('channel is not running now')); + return; + } + if (typeof route !== 'string') { + cb = opts; + opts = msg; + msg = route; + route = msg.route; + } + if (!cb && typeof opts === 'function') { + cb = opts; + opts = {}; + } + sendMessageByGroup(this.__channelService__, route, msg, this.groups, opts, cb); + } +} +exports.Channel = Channel; +/** + * add uid and sid into group. ignore any uid that uid not specified. + * + * @param uid user id + * @param sid server id + * @param groups {Object} grouped uids, , key: sid, value: [uid] + */ +let add = function (uid, sid, groups) { + if (!sid) { + logger.warn('ignore uid %j for sid not specified.', uid); + infoLogger.warn('ignore uid %j for sid not specified.', uid); + return false; + } + let group = groups[sid]; + if (!group) { + group = []; + groups[sid] = group; + } + group.push(uid); + return true; +}; +/** + * delete element from array + */ +let deleteFrom = function (uid, sid, group) { + if (!uid || !sid || !group) { + return false; + } + for (let i = 0, l = group.length; i < l; i++) { + if (group[i] === uid) { + group.splice(i, 1); + return true; + } + } + return false; +}; +/** + * push message by group + * + * @param route {String} route route message + * @param msg {Object} message that would be sent to client + * @param groups {Object} grouped uids, , key: sid, value: [uid] + * @param opts {Object} push options + * @param cb {Function} cb(err) + * + * @api private + */ +let sendMessageByGroup = function (channelService, route, msg, groups, opts, cb) { + let app = channelService.app; + let namespace = 'sys'; + let service = 'channelRemote'; + let method = 'pushMessage'; + let count = Object.keys(groups).length; + let successFlag = false; + let failIds = []; + logger.debug('[%s] channelService sendMessageByGroup route: %s, msg: %j, groups: %j, opts: %j', app.serverId, route, msg, groups, opts); + infoLogger.debug('[%s] channelService sendMessageByGroup route: %s, msg: %j, groups: %j, opts: %j', app.serverId, route, msg, groups, opts); + if (count === 0) { + // group is empty + utils.invokeCallback(cb); + return; + } + let latch = countDownLatch.createCountDownLatch(count, function () { + if (!successFlag) { + utils.invokeCallback(cb, new Error('all uids push message fail')); + return; + } + utils.invokeCallback(cb, null, failIds); + }); + let rpcCB = function (serverId) { + return function (err, fails) { + if (err) { + logger.error('[pushMessage] fail to dispatch msg to serverId: ' + serverId + ', err:' + err.stack); + infoLogger.error('[pushMessage] fail to dispatch msg to serverId: ' + serverId + ', err:' + err.stack); + latch.done(); + return; + } + if (fails) { + failIds = failIds.concat(fails); + } + successFlag = true; + latch.done(); + }; + }; + opts = { type: 'push', userOptions: opts || {} }; + // for compatiblity + opts.isPush = true; + let sendMessage = function (sid) { + return (function () { + if (sid === app.serverId) { + channelService.channelRemote[method](route, msg, groups[sid], opts).then((fails) => { + rpcCB(sid)(null, fails); + }, (err) => { + rpcCB(sid)(err, null); + }); + } + else { + app.rpcInvoke(sid, { + namespace: namespace, service: service, + method: method, args: [route, msg, groups[sid], opts] + }, rpcCB(sid)); + } + })(); + }; + let group; + for (let sid in groups) { + group = groups[sid]; + if (group && group.length > 0) { + sendMessage(sid); + } + else { + // empty group + process.nextTick(rpcCB(sid)); + } + } +}; +let restoreChannel = function (self, cb) { + if (!self.store) { + utils.invokeCallback(cb); + return; + } + else { + loadAllFromStore(self, genKey(self), function (err, list) { + if (!!err) { + utils.invokeCallback(cb, err); + return; + } + else { + if (!list.length || !Array.isArray(list)) { + utils.invokeCallback(cb); + return; + } + let load = function (key, name) { + return (function () { + let channelName = name; + loadAllFromStore(self, key, function (err, items) { + for (let j = 0; j < items.length; j++) { + let array = items[j].split(':'); + let sid = array[0]; + let uid = array[1]; + let channel = self.channels[channelName]; + let res = add(uid, sid, channel.groups); + if (res) { + channel.records[uid] = { sid: sid, uid: uid }; + } + } + }); + })(); + }; + for (let i = 0; i < list.length; i++) { + let name = list[i].slice(genKey(self).length + 1); + self.channels[name] = new Channel(name, self); + load(list[i], name); + } + utils.invokeCallback(cb); + } + }); + } +}; +let addToStore = function (self, key, value) { + if (!!self.store) { + self.store.add(key, value, function (err) { + if (!!err) { + logger.error('add key: %s value: %s to store, with err: %j', key, value, err); + infoLogger.error('add key: %s value: %s to store, with err: %j', key, value, err); + } + }); + } +}; +let removeFromStore = function (self, key, value) { + if (!!self.store) { + self.store.remove(key, value, function (err) { + if (!!err) { + logger.error('remove key: %s value: %s from store, with err: %j', key, value, err); + infoLogger.error('remove key: %s value: %s from store, with err: %j', key, value, err); + } + }); + } +}; +let loadAllFromStore = function (self, key, cb) { + if (!!self.store) { + self.store.load(key, function (err, list) { + if (!!err) { + logger.error('load key: %s from store, with err: %j', key, err); + infoLogger.error('load key: %s from store, with err: %j', key, err); + utils.invokeCallback(cb, err); + } + else { + utils.invokeCallback(cb, null, list); + } + }); + } +}; +let removeAllFromStore = function (self, key) { + if (!!self.store) { + self.store.removeAll(key, function (err) { + if (!!err) { + logger.error('remove key: %s all members from store, with err: %j', key, err); + infoLogger.error('remove key: %s all members from store, with err: %j', key, err); + } + }); + } +}; +let genKey = function (self, name) { + if (!!name) { + return self.prefix + ':' + self.app.serverId + ':' + name; + } + else { + return self.prefix + ':' + self.app.serverId; + } +}; +let genValue = function (sid, uid) { + return sid + ':' + uid; +}; +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"channelService.js","sourceRoot":"","sources":["../../../../lib/common/service/channelService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/game-server/config/sq1/log4js.ts b/game-server/config/sq1/log4js.ts index 93bb0e1fd..33f3a5881 100644 --- a/game-server/config/sq1/log4js.ts +++ b/game-server/config/sq1/log4js.ts @@ -61,11 +61,11 @@ module.exports = { 'pinus': { 'type': 'file', 'filename': '/zyz_logs/log4js/pinus-${opts:serverId}.log', - 'maxLogSize': 1048576, + 'maxLogSize': 1073741824, 'layout': { 'type': 'basic' }, - 'backups': 5 + 'backups': 20 }, 'pinus-admin': { 'type': 'file', @@ -88,16 +88,16 @@ module.exports = { 'app': { 'type': 'file', 'filename': '/zyz_logs/sls/app.log', - 'maxLogSize': 10485760, + 'maxLogSize': 1073741824, 'layout': { 'type': 'basic' }, - 'backups': 15 + 'backups': 20 }, 'error': { 'type': 'file', 'filename': '/zyz_logs/sls/error.log', - 'maxLogSize': 1048576, + 'maxLogSize': 1073741824, 'layout': { 'type': 'basic' }, diff --git a/game-server/pm2Starter.sh b/game-server/pm2Starter.sh index 615735a1d..65e1dc0b8 100755 --- a/game-server/pm2Starter.sh +++ b/game-server/pm2Starter.sh @@ -1,5 +1,6 @@ #/bin/bash npm install #安装依赖库 +cp ./channelService.js ./node_modules/pinus/dist/lib/common/service/channelService.js npm run build node pm2Config.js #使用pm2来做进程管理，生成进程配置文件 -pm2 start pomeloPm2Start.json #pm2 启动游戏服务器 +pm2 start pomeloPm2Start.json #pm2 启动游戏服务器 \ No newline at end of file diff --git a/game-server/pm2StarterDistribute.sh b/game-server/pm2StarterDistribute.sh index d017a743b..5e8493f11 100755 --- a/game-server/pm2StarterDistribute.sh +++ b/game-server/pm2StarterDistribute.sh @@ -9,6 +9,7 @@ if [ $# != 2 ] ; then fi npm install #安装依赖库 +cp ./channelService.js ./node_modules/pinus/dist/lib/common/service/channelService.js npm run build node pm2DistributeConfig.js ${1} ${2} #使用pm2来做进程管理，生成进程配置文件 pm2 start pomeloPm2Start.json #pm2 启动游戏服务器 diff --git a/shared/pubUtils/dicParam.ts b/shared/pubUtils/dicParam.ts index c2d1335d0..7ed12003c 100644 --- a/shared/pubUtils/dicParam.ts +++ b/shared/pubUtils/dicParam.ts @@ -238,7 +238,7 @@ export const GK_MAINELITE = { GKMAINELITE_OPEN_CONDITION: 424, // 梦魇模式开启时间：通过某关卡id }; export const SERVER_DEBUG_MODE = { - CURRENT_TIME: 1, // 服务器是否打开推送时间debug模式 + CURRENT_TIME: 0, // 服务器是否打开推送时间debug模式 CHECK_WORD: 1, // 服务器是否打开屏蔽词校验debug模式 }; export const IS_SQ = {