Skip to content

S
srvpro
Commit 52b2d83b authored by mercury233's avatar mercury233
Browse files
Options

update config files

parent de01cf49
Show whitespace changes
Inline Side-by-side
Showing with 298 additions and 115 deletions
data/default_config.json
View file @ 52b2d83b
{ {
"file": "./config/config.json",
"port": 7911, "port": 7911,
"version": 4924, "version": 4924,
"hostinfo": { "hostinfo": {
...@@ -171,23 +172,7 @@ ...@@ -171,23 +172,7 @@
"ban": { "ban": {
"banned_user": [], "banned_user": [],
"banned_ip": [], "banned_ip": [],
"badword_level0": ["滚", "衮", "操", "草", "艹", "狗", "日", "曰", "妈", "娘", "逼"],
"badword_level1": ["傻逼", "鸡巴"],
"badword_level2": ["死妈", "草你妈"],
"badword_level3": ["迷奸", "仿真枪"],
"illegal_id": ["^Lv\\.-*\\d+\\s*(.*)", "^VIP\\.\\d+\\s*(.*)"], "illegal_id": ["^Lv\\.-*\\d+\\s*(.*)", "^VIP\\.\\d+\\s*(.*)"],
"spam_word": ["——"] "spam_word": ["——"]
},
"tips": [
"欢迎来到本服务器",
"本服务器使用萌卡代码搭建"
],
"dialogues": {
"46986414": [
"出来吧，我最强的仆人，黑魔导！"
],
"58481572": [
"我们来做朋友吧！"
]
} }
} }
\ No newline at end of file
data/default_data.json 0 → 100644
View file @ 52b2d83b
{
"badwords": {
"file": "./config/badwords.json",
"level0": ["滚", "衮", "操", "草", "艹", "狗", "日", "曰", "妈", "娘", "逼"],
"level1": ["傻逼", "鸡巴"],
"level2": ["死妈", "草你妈"],
"level3": ["迷奸", "仿真枪"]
},
"tips": {
"file": "./config/tips.json",
"tips": [
"欢迎来到本服务器",
"本服务器使用萌卡代码搭建"
]
},
"dialogues": {
"file": "./config/dialogues.json",
"dialogues": {
"46986414": [
"出来吧，我最强的仆人，黑魔导！"
],
"58481572": [
"我们来做朋友吧！"
]
}
}
}
\ No newline at end of file
package.json
View file @ 52b2d83b
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
"author": "zh99998 <zh99998@gmail.com>, mercury233 <me@mercury233.me>", "author": "zh99998 <zh99998@gmail.com>, mercury233 <me@mercury233.me>",
"dependencies": { "dependencies": {
"bunyan": "latest", "bunyan": "latest",
"deepmerge": "latest",
"moment": "latest", "moment": "latest",
"nconf": "latest",
"request": "latest", "request": "latest",
"underscore": "latest", "underscore": "latest",
"underscore.string": "latest" "underscore.string": "latest"
......
ygopro-server.coffee
View file @ 52b2d83b
...@@ -39,22 +39,58 @@ moment.locale('zh-cn', { ...@@ -39,22 +39,58 @@ moment.locale('zh-cn', {
} }
}) })
merge = require 'deepmerge'
#heapdump = require 'heapdump' #heapdump = require 'heapdump'
# 配置 # 配置
# use nconf to save user config.json . # 导入旧配置
# default_config.json shouldn't be changed
if not fs.existsSync('./config') if not fs.existsSync('./config')
fs.mkdirSync('./config') fs.mkdirSync('./config')
nconf = require 'nconf' try
nconf.file('./config/config.json') oldconfig=require('./config.user.json')
defaultconfig = require('./data/default_config.json') if oldconfig.tips
nconf.defaults(defaultconfig) oldtips = {}
settings = global.settings = nconf.get() oldtips.file = './config/tips.json'
nconf.myset = (settings, path, val) -> oldtips.tips = oldconfig.tips
fs.writeFileSync(oldtips.file, JSON.stringify(oldtips, null, 2))
delete oldconfig.tips
if oldconfig.dialogues
olddialogues = {}
olddialogues.file = './config/dialogues.json'
olddialogues.dialogues = oldconfig.dialogues
fs.writeFileSync(olddialogues.file, JSON.stringify(olddialogues, null, 2))
delete oldconfig.dialogues
oldbadwords={}
if oldconfig.ban.badword_level0
oldbadwords.level0 = oldconfig.ban.badword_level0
if oldconfig.ban.badword_level1
oldbadwords.level1 = oldconfig.ban.badword_level1
if oldconfig.ban.badword_level2
oldbadwords.level2 = oldconfig.ban.badword_level2
if oldconfig.ban.badword_level3
oldbadwords.level3 = oldconfig.ban.badword_level3
if not _.isEmpty(oldbadwords)
oldbadwords.file = './config/badwords.json'
fs.writeFileSync(oldbadwords.file, JSON.stringify(oldbadwords, null, 2))
delete oldconfig.ban.badword_level0
delete oldconfig.ban.badword_level1
delete oldconfig.ban.badword_level2
delete oldconfig.ban.badword_level3
if not _.isEmpty(oldconfig)
# log.info oldconfig
fs.writeFileSync('./config/config.json', JSON.stringify(oldconfig, null, 2))
log.info 'imported old config from config.user.json'
fs.renameSync('./config.user.json', './config.user.bak')
catch e
log.info e unless e.code == 'MODULE_NOT_FOUND'
setting_save = (settings) ->
fs.writeFileSync(settings.file, JSON.stringify(settings, null, 2))
return
setting_change = (settings, path, val) ->
# path should be like "modules:welcome" # path should be like "modules:welcome"
nconf.set(path, val)
nconf.save()
log.info("setting changed", path, val) if _.isString(val) log.info("setting changed", path, val) if _.isString(val)
path=path.split(':') path=path.split(':')
if path.length == 0 if path.length == 0
...@@ -66,17 +102,44 @@ nconf.myset = (settings, path, val) -> ...@@ -66,17 +102,44 @@ nconf.myset = (settings, path, val) ->
target=target[key] target=target[key]
key = path.shift() key = path.shift()
target[key] = val target[key] = val
setting_save(settings)
return return
# 读取配置
default_config = require('./data/default_config.json')
try
config = require('./config/config.json')
catch
config = {}
settings = global.settings = merge(default_config, config, { arrayMerge: (destination, source) -> source })
# 读取数据
default_data = require('./data/default_data.json')
try
tips = require('./config/tips.json')
catch
tips = default_data.tips
setting_save(tips)
try
dialogues = require('./config/dialogues.json')
catch
dialogues = default_data.dialogues
setting_save(dialogues)
try
badwords = require('./config/badwords.json')
catch
badwords = default_data.badwords
setting_save(badwords)
try try
cppversion = parseInt(fs.readFileSync('ygopro/gframe/game.cpp', 'utf8').match(/PRO_VERSION = ([x\dABCDEF]+)/)[1], '16') cppversion = parseInt(fs.readFileSync('ygopro/gframe/game.cpp', 'utf8').match(/PRO_VERSION = ([x\dABCDEF]+)/)[1], '16')
nconf.myset(settings, "version", cppversion) setting_change(settings, "version", cppversion)
log.info "ygopro version 0x"+settings.version.toString(16), "(from source code)" log.info "ygopro version 0x"+settings.version.toString(16), "(from source code)"
catch catch
#settings.version = settings.version_default #settings.version = settings.version_default
log.info "ygopro version 0x"+settings.version.toString(16), "(from config)" log.info "ygopro version 0x"+settings.version.toString(16), "(from config)"
# load the lflist of current date # load the lflist of current date
settings.lflist = (for list in fs.readFileSync('ygopro/lflist.conf', 'utf8').match(/!.*/g) lflists = (for list in fs.readFileSync('ygopro/lflist.conf', 'utf8').match(/!.*/g)
date=list.match(/!([\d\.]+)/) date=list.match(/!([\d\.]+)/)
continue unless date continue unless date
{date: moment(list.match(/!([\d\.]+)/)[1], 'YYYY.MM.DD').utcOffset("-08:00"), tcg: list.indexOf('TCG') != -1}) {date: moment(list.match(/!([\d\.]+)/)[1], 'YYYY.MM.DD').utcOffset("-08:00"), tcg: list.indexOf('TCG') != -1})
...@@ -90,7 +153,16 @@ if settings.modules.cloud_replay.enabled ...@@ -90,7 +153,16 @@ if settings.modules.cloud_replay.enabled
return return
if settings.modules.windbot.enabled if settings.modules.windbot.enabled
settings.modules.windbots = require(settings.modules.windbot.botlist).windbots windbots = require(settings.modules.windbot.botlist).windbots
if settings.modules.tournament_mode.enabled
duel_log = {}
clearlog = () ->
duel_log = {}
duel_log.file = 'duel_log.' + moment().format('YYYY-MM-DD HH-mm-ss') + '.json'
duel_log.duel_log = []
setting_save(duel_log)
clearlog()
# 组件 # 组件
ygopro = require './ygopro.js' ygopro = require './ygopro.js'
...@@ -150,7 +222,7 @@ ROOM_bad_ip = {} ...@@ -150,7 +222,7 @@ ROOM_bad_ip = {}
# ban a user manually and permanently # ban a user manually and permanently
ban_user = (name) -> ban_user = (name) ->
settings.ban.banned_user.push(name) settings.ban.banned_user.push(name)
nconf.myset(settings, "ban:banned_user", settings.ban.banned_user) setting_save(settings)
bad_ip=0 bad_ip=0
for room in ROOM_all when room and room.established for room in ROOM_all when room and room.established
for player in room.players for player in room.players
...@@ -242,17 +314,17 @@ ROOM_find_or_create_ai = (name)-> ...@@ -242,17 +314,17 @@ ROOM_find_or_create_ai = (name)->
if room = ROOM_find_by_name(name) if room = ROOM_find_by_name(name)
return room return room
else if uname == 'AI' else if uname == 'AI'
windbot = _.sample settings.modules.windbots windbot = _.sample windbots
name = 'AI#' + Math.floor(Math.random() * 100000) name = 'AI#' + Math.floor(Math.random() * 100000)
else if namea.length>1 else if namea.length>1
ainame = namea[namea.length-1] ainame = namea[namea.length-1]
windbot = _.sample _.filter settings.modules.windbots, (w)-> windbot = _.sample _.filter windbots, (w)->
w.name == ainame or w.deck == ainame w.name == ainame or w.deck == ainame
if !windbot if !windbot
return { "error": "${windbot_deck_not_found}" } return { "error": "${windbot_deck_not_found}" }
name = name + ',' + Math.floor(Math.random() * 100000) name = name + ',' + Math.floor(Math.random() * 100000)
else else
windbot = _.sample settings.modules.windbots windbot = _.sample windbots
name = name + '#' + Math.floor(Math.random() * 100000) name = name + '#' + Math.floor(Math.random() * 100000)
if name.replace(/[^\x00-\xff]/g,"00").length>20 if name.replace(/[^\x00-\xff]/g,"00").length>20
log.info "long ai name", name log.info "long ai name", name
...@@ -319,9 +391,9 @@ class Room ...@@ -319,9 +391,9 @@ class Room
ROOM_all.push this ROOM_all.push this
@hostinfo ||= JSON.parse(JSON.stringify(settings.hostinfo)) @hostinfo ||= JSON.parse(JSON.stringify(settings.hostinfo))
if settings.lflist.length if lflists.length
if @hostinfo.rule == 1 and @hostinfo.lflist == 0 if @hostinfo.rule == 1 and @hostinfo.lflist == 0
@hostinfo.lflist = _.findIndex settings.lflist, (list)-> list.tcg @hostinfo.lflist = _.findIndex lflists, (list)-> list.tcg
else else
@hostinfo.lflist = -1 @hostinfo.lflist = -1
@hostinfo.replay_mode = if settings.modules.tournament_mode.enabled and settings.modules.tournament_mode.replay_safe then 1 else 0 @hostinfo.replay_mode = if settings.modules.tournament_mode.enabled and settings.modules.tournament_mode.replay_safe then 1 else 0
...@@ -357,7 +429,7 @@ class Room ...@@ -357,7 +429,7 @@ class Room
if (rule.match /(^|，|,)(TCGONLY|TO)(，|,|$)/) if (rule.match /(^|，|,)(TCGONLY|TO)(，|,|$)/)
@hostinfo.rule = 1 @hostinfo.rule = 1
@hostinfo.lflist = _.findIndex settings.lflist, (list)-> list.tcg @hostinfo.lflist = _.findIndex lflists, (list)-> list.tcg
if (rule.match /(^|，|,)(OCGONLY|OO)(，|,|$)/) if (rule.match /(^|，|,)(OCGONLY|OO)(，|,|$)/)
@hostinfo.rule = 0 @hostinfo.rule = 0
...@@ -835,6 +907,9 @@ net.createServer (client) -> ...@@ -835,6 +907,9 @@ net.createServer (client) ->
log.info "server started", settings.port log.info "server started", settings.port
return return
if settings.modules.stop
log.info "NOTE: server not open due to config, ", settings.modules.stop
# 功能模块 # 功能模块
# return true to cancel a synchronous message # return true to cancel a synchronous message
...@@ -987,7 +1062,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)-> ...@@ -987,7 +1062,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)->
start_hand: opt3 >> 4 start_hand: opt3 >> 4
draw_count: opt3 & 0xF draw_count: opt3 & 0xF
} }
options.lflist = _.findIndex settings.lflist, (list)-> ((options.rule == 1) == list.tcg) and list.date.isBefore() options.lflist = _.findIndex lflists, (list)-> ((options.rule == 1) == list.tcg) and list.date.isBefore()
room = new Room(name, options) room = new Room(name, options)
room.title = info.pass.slice(8).replace(String.fromCharCode(0xFEFF), ' ') room.title = info.pass.slice(8).replace(String.fromCharCode(0xFEFF), ' ')
room.private = action == 2 room.private = action == 2
...@@ -1081,6 +1156,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)-> ...@@ -1081,6 +1156,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)->
else if _.indexOf(settings.ban.banned_user, client.name) > -1 #账号被封 else if _.indexOf(settings.ban.banned_user, client.name) > -1 #账号被封
settings.ban.banned_ip.push(client.ip) settings.ban.banned_ip.push(client.ip)
setting_save(settings)
log.warn("BANNED USER LOGIN", client.name, client.ip) log.warn("BANNED USER LOGIN", client.name, client.ip)
ygopro.stoc_die(client, "${banned_user_login}") ygopro.stoc_die(client, "${banned_user_login}")
...@@ -1088,21 +1164,21 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)-> ...@@ -1088,21 +1164,21 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)->
log.warn("BANNED IP LOGIN", client.name, client.ip) log.warn("BANNED IP LOGIN", client.name, client.ip)
ygopro.stoc_die(client, "${banned_ip_login}") ygopro.stoc_die(client, "${banned_ip_login}")
else if _.any(settings.ban.badword_level3, (badword) -> else if _.any(badwords.level3, (badword) ->
regexp = new RegExp(badword, 'i') regexp = new RegExp(badword, 'i')
return name.match(regexp) return name.match(regexp)
, name = client.name) , name = client.name)
log.warn("BAD NAME LEVEL 3", client.name, client.ip) log.warn("BAD NAME LEVEL 3", client.name, client.ip)
ygopro.stoc_die(client, "${bad_name_level3}") ygopro.stoc_die(client, "${bad_name_level3}")
else if _.any(settings.ban.badword_level2, (badword) -> else if _.any(badwords.level2, (badword) ->
regexp = new RegExp(badword, 'i') regexp = new RegExp(badword, 'i')
return name.match(regexp) return name.match(regexp)
, name = client.name) , name = client.name)
log.warn("BAD NAME LEVEL 2", client.name, client.ip) log.warn("BAD NAME LEVEL 2", client.name, client.ip)
ygopro.stoc_die(client, "${bad_name_level2}") ygopro.stoc_die(client, "${bad_name_level2}")
else if _.any(settings.ban.badword_level1, (badword) -> else if _.any(badwords.level1, (badword) ->
regexp = new RegExp(badword, 'i') regexp = new RegExp(badword, 'i')
return name.match(regexp) return name.match(regexp)
, name = client.name) , name = client.name)
...@@ -1226,8 +1302,8 @@ load_dialogues = () -> ...@@ -1226,8 +1302,8 @@ load_dialogues = () ->
else if error or !body else if error or !body
log.warn 'dialogues error', error, response log.warn 'dialogues error', error, response
else else
nconf.myset(settings, "dialogues", body) setting_change(dialogues, "dialogues", body)
log.info "dialogues loaded", _.size body log.info "dialogues loaded", _.size dialogues.dialogues
return return
return return
...@@ -1328,8 +1404,8 @@ ygopro.stoc_follow 'GAME_MSG', false, (buffer, info, client, server)-> ...@@ -1328,8 +1404,8 @@ ygopro.stoc_follow 'GAME_MSG', false, (buffer, info, client, server)->
if settings.modules.dialogues.enabled if settings.modules.dialogues.enabled
if ygopro.constants.MSG[msg] == 'SUMMONING' or ygopro.constants.MSG[msg] == 'SPSUMMONING' if ygopro.constants.MSG[msg] == 'SUMMONING' or ygopro.constants.MSG[msg] == 'SPSUMMONING'
card = buffer.readUInt32LE(1) card = buffer.readUInt32LE(1)
if settings.dialogues[card] if dialogues.dialogues[card]
for line in _.lines settings.dialogues[card][Math.floor(Math.random() * settings.dialogues[card].length)] for line in _.lines dialogues.dialogues[card][Math.floor(Math.random() * dialogues.dialogues[card].length)]
ygopro.stoc_send_chat(client, line, ygopro.constants.COLORS.PINK) ygopro.stoc_send_chat(client, line, ygopro.constants.COLORS.PINK)
return return
...@@ -1448,12 +1524,12 @@ wait_room_start_arena = (room)-> ...@@ -1448,12 +1524,12 @@ wait_room_start_arena = (room)->
#tip #tip
ygopro.stoc_send_random_tip = (client)-> ygopro.stoc_send_random_tip = (client)->
if settings.modules.tips.enabled && settings.tips.length if settings.modules.tips.enabled && tips.tips.length
ygopro.stoc_send_chat(client, "Tip: " + settings.tips[Math.floor(Math.random() * settings.tips.length)]) ygopro.stoc_send_chat(client, "Tip: " + tips.tips[Math.floor(Math.random() * tips.tips.length)])
return return
ygopro.stoc_send_random_tip_to_room = (room)-> ygopro.stoc_send_random_tip_to_room = (room)->
if settings.modules.tips.enabled && settings.tips.length if settings.modules.tips.enabled && tips.tips.length
ygopro.stoc_send_chat_to_room(room, "Tip: " + settings.tips[Math.floor(Math.random() * settings.tips.length)]) ygopro.stoc_send_chat_to_room(room, "Tip: " + tips.tips[Math.floor(Math.random() * tips.tips.length)])
return return
load_tips = ()-> load_tips = ()->
...@@ -1466,8 +1542,8 @@ load_tips = ()-> ...@@ -1466,8 +1542,8 @@ load_tips = ()->
else if error or !body else if error or !body
log.warn 'tips error', error, response log.warn 'tips error', error, response
else else
nconf.myset(settings, "tips", body) setting_change(tips, "tips", body)
log.info "tips loaded", settings.tips.length log.info "tips loaded", tips.tips.length
return return
return return
...@@ -1599,13 +1675,13 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server)-> ...@@ -1599,13 +1675,13 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server)->
when '/ai' when '/ai'
if settings.modules.windbot.enabled if settings.modules.windbot.enabled
if name = cmd[1] if name = cmd[1]
windbot = _.sample _.filter settings.modules.windbots, (w)-> windbot = _.sample _.filter windbots, (w)->
w.name == name or w.deck == name w.name == name or w.deck == name
if !windbot if !windbot
ygopro.stoc_send_chat(client, "${windbot_deck_not_found}", ygopro.constants.COLORS.RED) ygopro.stoc_send_chat(client, "${windbot_deck_not_found}", ygopro.constants.COLORS.RED)
return return
else else
windbot = _.sample settings.modules.windbots windbot = _.sample windbots
room.add_windbot(windbot) room.add_windbot(windbot)
when '/roomname' when '/roomname'
...@@ -1625,7 +1701,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server)-> ...@@ -1625,7 +1701,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server)->
ygopro.stoc_send_chat(client, "${banned_chat_tip}", ygopro.constants.COLORS.RED) ygopro.stoc_send_chat(client, "${banned_chat_tip}", ygopro.constants.COLORS.RED)
return true return true
oldmsg = msg oldmsg = msg
if (_.any(settings.ban.badword_level3, (badword) -> if (_.any(badwords.level3, (badword) ->
regexp = new RegExp(badword, 'i') regexp = new RegExp(badword, 'i')
return msg.match(regexp) return msg.match(regexp)
, msg)) , msg))
...@@ -1653,7 +1729,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server)-> ...@@ -1653,7 +1729,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server)->
client.abuse_count=client.abuse_count+2 client.abuse_count=client.abuse_count+2
ygopro.stoc_send_chat(client, "${chat_warn_level0}", ygopro.constants.COLORS.RED) ygopro.stoc_send_chat(client, "${chat_warn_level0}", ygopro.constants.COLORS.RED)
cancel = true cancel = true
else if (_.any(settings.ban.badword_level2, (badword) -> else if (_.any(badwords.level2, (badword) ->
regexp = new RegExp(badword, 'i') regexp = new RegExp(badword, 'i')
return msg.match(regexp) return msg.match(regexp)
, msg)) , msg))
...@@ -1663,7 +1739,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server)-> ...@@ -1663,7 +1739,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server)->
ygopro.stoc_send_chat(client, "${chat_warn_level2}", ygopro.constants.COLORS.RED) ygopro.stoc_send_chat(client, "${chat_warn_level2}", ygopro.constants.COLORS.RED)
cancel = true cancel = true
else else
_.each(settings.ban.badword_level1, (badword) -> _.each(badwords.level1, (badword) ->
#log.info msg #log.info msg
regexp = new RegExp(badword, "ig") regexp = new RegExp(badword, "ig")
msg = msg.replace(regexp, "**") msg = msg.replace(regexp, "**")
...@@ -1678,7 +1754,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server)-> ...@@ -1678,7 +1754,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server)->
struct._setBuff(buffer) struct._setBuff(buffer)
struct.set("msg", msg) struct.set("msg", msg)
buffer = struct.buffer buffer = struct.buffer
else if (_.any(settings.ban.badword_level0, (badword) -> else if (_.any(badwords.level0, (badword) ->
regexp = new RegExp(badword, 'i') regexp = new RegExp(badword, 'i')
return msg.match(regexp) return msg.match(regexp)
, msg)) , msg))
...@@ -1818,8 +1894,8 @@ ygopro.stoc_follow 'REPLAY', true, (buffer, info, client, server)-> ...@@ -1818,8 +1894,8 @@ ygopro.stoc_follow 'REPLAY', true, (buffer, info, client, server)->
winner: player.pos == room.winner winner: player.pos == room.winner
) )
} }
settings.modules.tournament_mode.duel_log.unshift duellog duel_log.duel_log.unshift duellog
nconf.myset(settings, "modules:tournament_mode:duel_log", settings.modules.tournament_mode.duel_log) setting_save(duel_log)
fs.writeFile(settings.modules.tournament_mode.replay_path + replay_filename, buffer, (err)-> fs.writeFile(settings.modules.tournament_mode.replay_path + replay_filename, buffer, (err)->
if err then log.warn "SAVE REPLAY ERROR", replay_filename, err if err then log.warn "SAVE REPLAY ERROR", replay_filename, err
) )
...@@ -1926,7 +2002,7 @@ if settings.modules.http ...@@ -1926,7 +2002,7 @@ if settings.modules.http
return return
else else
response.writeHead(200) response.writeHead(200)
duellog = JSON.stringify settings.modules.tournament_mode.duel_log, null, 2 duellog = JSON.stringify duel_log.duel_log, null, 2
response.end(addCallback(u.query.callback, duellog)) response.end(addCallback(u.query.callback, duellog))
else if u.pathname == '/api/archive.zip' and settings.modules.tournament_mode.enabled else if u.pathname == '/api/archive.zip' and settings.modules.tournament_mode.enabled
...@@ -1939,7 +2015,7 @@ if settings.modules.http ...@@ -1939,7 +2015,7 @@ if settings.modules.http
archive_name = moment().format('YYYY-MM-DD HH:mm:ss') + ".zip" archive_name = moment().format('YYYY-MM-DD HH:mm:ss') + ".zip"
archive_args = ["a", "-mx0", "-y", archive_name] archive_args = ["a", "-mx0", "-y", archive_name]
check = false check = false
for replay in settings.modules.tournament_mode.duel_log for replay in duel_log.duel_log
check = true check = true
archive_args.push(replay.replay_filename) archive_args.push(replay.replay_filename)
if !check if !check
...@@ -1979,8 +2055,7 @@ if settings.modules.http ...@@ -1979,8 +2055,7 @@ if settings.modules.http
return return
else else
response.writeHead(200) response.writeHead(200)
settings.modules.tournament_mode.duel_log = [] clearlog()
nconf.myset(settings, "modules:tournament_mode:duel_log", settings.modules.tournament_mode.duel_log)
response.end(addCallback(u.query.callback, "[{name:'Success'}]")) response.end(addCallback(u.query.callback, "[{name:'Success'}]"))
else if _.startsWith(u.pathname, '/api/replay') and settings.modules.tournament_mode.enabled else if _.startsWith(u.pathname, '/api/replay') and settings.modules.tournament_mode.enabled
...@@ -2015,12 +2090,12 @@ if settings.modules.http ...@@ -2015,12 +2090,12 @@ if settings.modules.http
else if u.query.stop else if u.query.stop
if u.query.stop == 'false' if u.query.stop == 'false'
u.query.stop = false u.query.stop = false
settings.modules.stop = u.query.stop setting_change(settings, 'modules:stop', u.query.stop)
response.writeHead(200) response.writeHead(200)
response.end(addCallback(u.query.callback, "['stop ok', '" + u.query.stop + "']")) response.end(addCallback(u.query.callback, "['stop ok', '" + u.query.stop + "']"))
else if u.query.welcome else if u.query.welcome
nconf.myset(settings, 'modules:welcome', u.query.welcome) setting_change(settings, 'modules:welcome', u.query.welcome)
response.writeHead(200) response.writeHead(200)
response.end(addCallback(u.query.callback, "['welcome ok', '" + u.query.welcome + "']")) response.end(addCallback(u.query.callback, "['welcome ok', '" + u.query.welcome + "']"))
......
ygopro-server.js
View file @ 52b2d83b
// Generated by CoffeeScript 1.12.7 // Generated by CoffeeScript 1.12.7
(function() { (function() {
var Cloud_replay_ids, ROOM_all, ROOM_bad_ip, ROOM_ban_player, ROOM_connected_ip, ROOM_find_by_name, ROOM_find_by_port, ROOM_find_by_title, ROOM_find_or_create_ai, ROOM_find_or_create_by_name, ROOM_find_or_create_random, ROOM_players_banned, ROOM_players_oppentlist, ROOM_unwelcome, ROOM_validate, Room, _, addCallback, ban_user, bunyan, cppversion, crypto, date, defaultconfig, execFile, fs, geoip, get_memory_usage, http, http_server, https, https_server, list, load_dialogues, load_tips, log, moment, nconf, net, options, os, path, pgClient, pg_client, pg_query, redis, redisdb, report_to_big_brother, request, requestListener, roomlist, settings, spawn, spawnSync, url, users_cache, wait_room_start, wait_room_start_arena, windbot_bin, windbot_parameters, windbot_process, ygopro, zlib; var Cloud_replay_ids, ROOM_all, ROOM_bad_ip, ROOM_ban_player, ROOM_connected_ip, ROOM_find_by_name, ROOM_find_by_port, ROOM_find_by_title, ROOM_find_or_create_ai, ROOM_find_or_create_by_name, ROOM_find_or_create_random, ROOM_players_banned, ROOM_players_oppentlist, ROOM_unwelcome, ROOM_validate, Room, _, addCallback, badwords, ban_user, bunyan, clearlog, config, cppversion, crypto, date, default_config, default_data, dialogues, duel_log, e, execFile, fs, geoip, get_memory_usage, http, http_server, https, https_server, lflists, list, load_dialogues, load_tips, log, merge, moment, net, oldbadwords, oldconfig, olddialogues, oldtips, options, os, path, pgClient, pg_client, pg_query, redis, redisdb, report_to_big_brother, request, requestListener, roomlist, setting_change, setting_save, settings, spawn, spawnSync, tips, url, users_cache, wait_room_start, wait_room_start_arena, windbot_bin, windbot_parameters, windbot_process, windbots, ygopro, zlib;
net = require('net'); net = require('net');
...@@ -56,24 +56,67 @@ ...@@ -56,24 +56,67 @@
} }
}); });
merge = require('deepmerge');
if (!fs.existsSync('./config')) { if (!fs.existsSync('./config')) {
fs.mkdirSync('./config'); fs.mkdirSync('./config');
} }
nconf = require('nconf'); try {
oldconfig = require('./config.user.json');
nconf.file('./config/config.json'); if (oldconfig.tips) {
oldtips = {};
defaultconfig = require('./data/default_config.json'); oldtips.file = './config/tips.json';
oldtips.tips = oldconfig.tips;
nconf.defaults(defaultconfig); fs.writeFileSync(oldtips.file, JSON.stringify(oldtips, null, 2));
delete oldconfig.tips;
}
if (oldconfig.dialogues) {
olddialogues = {};
olddialogues.file = './config/dialogues.json';
olddialogues.dialogues = oldconfig.dialogues;
fs.writeFileSync(olddialogues.file, JSON.stringify(olddialogues, null, 2));
delete oldconfig.dialogues;
}
oldbadwords = {};
if (oldconfig.ban.badword_level0) {
oldbadwords.level0 = oldconfig.ban.badword_level0;
}
if (oldconfig.ban.badword_level1) {
oldbadwords.level1 = oldconfig.ban.badword_level1;
}
if (oldconfig.ban.badword_level2) {
oldbadwords.level2 = oldconfig.ban.badword_level2;
}
if (oldconfig.ban.badword_level3) {
oldbadwords.level3 = oldconfig.ban.badword_level3;
}
if (!_.isEmpty(oldbadwords)) {
oldbadwords.file = './config/badwords.json';
fs.writeFileSync(oldbadwords.file, JSON.stringify(oldbadwords, null, 2));
delete oldconfig.ban.badword_level0;
delete oldconfig.ban.badword_level1;
delete oldconfig.ban.badword_level2;
delete oldconfig.ban.badword_level3;
}
if (!_.isEmpty(oldconfig)) {
fs.writeFileSync('./config/config.json', JSON.stringify(oldconfig, null, 2));
log.info('imported old config from config.user.json');
}
fs.renameSync('./config.user.json', './config.user.bak');
} catch (error1) {
e = error1;
if (e.code !== 'MODULE_NOT_FOUND') {
log.info(e);
}
}
settings = global.settings = nconf.get(); setting_save = function(settings) {
fs.writeFileSync(settings.file, JSON.stringify(settings, null, 2));
};
nconf.myset = function(settings, path, val) { setting_change = function(settings, path, val) {
var key, target; var key, target;
nconf.set(path, val);
nconf.save();
if (_.isString(val)) { if (_.isString(val)) {
log.info("setting changed", path, val); log.info("setting changed", path, val);
} }
...@@ -89,17 +132,55 @@ ...@@ -89,17 +132,55 @@
key = path.shift(); key = path.shift();
target[key] = val; target[key] = val;
} }
setting_save(settings);
}; };
default_config = require('./data/default_config.json');
try {
config = require('./config/config.json');
} catch (error1) {
config = {};
}
settings = global.settings = merge(default_config, config, {
arrayMerge: function(destination, source) {
return source;
}
});
default_data = require('./data/default_data.json');
try {
tips = require('./config/tips.json');
} catch (error1) {
tips = default_data.tips;
setting_save(tips);
}
try {
dialogues = require('./config/dialogues.json');
} catch (error1) {
dialogues = default_data.dialogues;
setting_save(dialogues);
}
try {
badwords = require('./config/badwords.json');
} catch (error1) {
badwords = default_data.badwords;
setting_save(badwords);
}
try { try {
cppversion = parseInt(fs.readFileSync('ygopro/gframe/game.cpp', 'utf8').match(/PRO_VERSION = ([x\dABCDEF]+)/)[1], '16'); cppversion = parseInt(fs.readFileSync('ygopro/gframe/game.cpp', 'utf8').match(/PRO_VERSION = ([x\dABCDEF]+)/)[1], '16');
nconf.myset(settings, "version", cppversion); setting_change(settings, "version", cppversion);
log.info("ygopro version 0x" + settings.version.toString(16), "(from source code)"); log.info("ygopro version 0x" + settings.version.toString(16), "(from source code)");
} catch (error1) { } catch (error1) {
log.info("ygopro version 0x" + settings.version.toString(16), "(from config)"); log.info("ygopro version 0x" + settings.version.toString(16), "(from config)");
} }
settings.lflist = (function() { lflists = (function() {
var j, len, ref, results; var j, len, ref, results;
ref = fs.readFileSync('ygopro/lflist.conf', 'utf8').match(/!.*/g); ref = fs.readFileSync('ygopro/lflist.conf', 'utf8').match(/!.*/g);
results = []; results = [];
...@@ -130,7 +211,18 @@ ...@@ -130,7 +211,18 @@
} }
if (settings.modules.windbot.enabled) { if (settings.modules.windbot.enabled) {
settings.modules.windbots = require(settings.modules.windbot.botlist).windbots; windbots = require(settings.modules.windbot.botlist).windbots;
}
if (settings.modules.tournament_mode.enabled) {
duel_log = {};
clearlog = function() {
duel_log = {};
duel_log.file = 'duel_log.' + moment().format('YYYY-MM-DD HH-mm-ss') + '.json';
duel_log.duel_log = [];
return setting_save(duel_log);
};
clearlog();
} }
ygopro = require('./ygopro.js'); ygopro = require('./ygopro.js');
...@@ -199,7 +291,7 @@ ...@@ -199,7 +291,7 @@
ban_user = function(name) { ban_user = function(name) {
var bad_ip, j, k, len, len1, player, ref, room; var bad_ip, j, k, len, len1, player, ref, room;
settings.ban.banned_user.push(name); settings.ban.banned_user.push(name);
nconf.myset(settings, "ban:banned_user", settings.ban.banned_user); setting_save(settings);
bad_ip = 0; bad_ip = 0;
for (j = 0, len = ROOM_all.length; j < len; j++) { for (j = 0, len = ROOM_all.length; j < len; j++) {
room = ROOM_all[j]; room = ROOM_all[j];
...@@ -330,11 +422,11 @@ ...@@ -330,11 +422,11 @@
if (room = ROOM_find_by_name(name)) { if (room = ROOM_find_by_name(name)) {
return room; return room;
} else if (uname === 'AI') { } else if (uname === 'AI') {
windbot = _.sample(settings.modules.windbots); windbot = _.sample(windbots);
name = 'AI#' + Math.floor(Math.random() * 100000); name = 'AI#' + Math.floor(Math.random() * 100000);
} else if (namea.length > 1) { } else if (namea.length > 1) {
ainame = namea[namea.length - 1]; ainame = namea[namea.length - 1];
windbot = _.sample(_.filter(settings.modules.windbots, function(w) { windbot = _.sample(_.filter(windbots, function(w) {
return w.name === ainame || w.deck === ainame; return w.name === ainame || w.deck === ainame;
})); }));
if (!windbot) { if (!windbot) {
...@@ -344,7 +436,7 @@ ...@@ -344,7 +436,7 @@
} }
name = name + ',' + Math.floor(Math.random() * 100000); name = name + ',' + Math.floor(Math.random() * 100000);
} else { } else {
windbot = _.sample(settings.modules.windbots); windbot = _.sample(windbots);
name = name + '#' + Math.floor(Math.random() * 100000); name = name + '#' + Math.floor(Math.random() * 100000);
} }
if (name.replace(/[^\x00-\xff]/g, "00").length > 20) { if (name.replace(/[^\x00-\xff]/g, "00").length > 20) {
...@@ -440,9 +532,9 @@ ...@@ -440,9 +532,9 @@
this.death = 0; this.death = 0;
ROOM_all.push(this); ROOM_all.push(this);
this.hostinfo || (this.hostinfo = JSON.parse(JSON.stringify(settings.hostinfo))); this.hostinfo || (this.hostinfo = JSON.parse(JSON.stringify(settings.hostinfo)));
if (settings.lflist.length) { if (lflists.length) {
if (this.hostinfo.rule === 1 && this.hostinfo.lflist === 0) { if (this.hostinfo.rule === 1 && this.hostinfo.lflist === 0) {
this.hostinfo.lflist = _.findIndex(settings.lflist, function(list) { this.hostinfo.lflist = _.findIndex(lflists, function(list) {
return list.tcg; return list.tcg;
}); });
} }
...@@ -478,7 +570,7 @@ ...@@ -478,7 +570,7 @@
} }
if (rule.match(/(^|，|,)(TCGONLY|TO)(，|,|$)/)) { if (rule.match(/(^|，|,)(TCGONLY|TO)(，|,|$)/)) {
this.hostinfo.rule = 1; this.hostinfo.rule = 1;
this.hostinfo.lflist = _.findIndex(settings.lflist, function(list) { this.hostinfo.lflist = _.findIndex(lflists, function(list) {
return list.tcg; return list.tcg;
}); });
} }
...@@ -1070,6 +1162,10 @@ ...@@ -1070,6 +1162,10 @@
log.info("server started", settings.port); log.info("server started", settings.port);
}); });
if (settings.modules.stop) {
log.info("NOTE: server not open due to config, ", settings.modules.stop);
}
ygopro.ctos_follow('PLAYER_INFO', true, function(buffer, info, client, server) { ygopro.ctos_follow('PLAYER_INFO', true, function(buffer, info, client, server) {
var geo, lang, name, struct; var geo, lang, name, struct;
name = info.name.split("$")[0]; name = info.name.split("$")[0];
...@@ -1214,7 +1310,7 @@ ...@@ -1214,7 +1310,7 @@
start_hand: opt3 >> 4, start_hand: opt3 >> 4,
draw_count: opt3 & 0xF draw_count: opt3 & 0xF
}; };
options.lflist = _.findIndex(settings.lflist, function(list) { options.lflist = _.findIndex(lflists, function(list) {
return ((options.rule === 1) === list.tcg) && list.date.isBefore(); return ((options.rule === 1) === list.tcg) && list.date.isBefore();
}); });
room = new Room(name, options); room = new Room(name, options);
...@@ -1325,26 +1421,27 @@ ...@@ -1325,26 +1421,27 @@
ygopro.stoc_die(client, "${too_much_connection}" + client.ip); ygopro.stoc_die(client, "${too_much_connection}" + client.ip);
} else if (_.indexOf(settings.ban.banned_user, client.name) > -1) { } else if (_.indexOf(settings.ban.banned_user, client.name) > -1) {
settings.ban.banned_ip.push(client.ip); settings.ban.banned_ip.push(client.ip);
setting_save(settings);
log.warn("BANNED USER LOGIN", client.name, client.ip); log.warn("BANNED USER LOGIN", client.name, client.ip);
ygopro.stoc_die(client, "${banned_user_login}"); ygopro.stoc_die(client, "${banned_user_login}");
} else if (_.indexOf(settings.ban.banned_ip, client.ip) > -1) { } else if (_.indexOf(settings.ban.banned_ip, client.ip) > -1) {
log.warn("BANNED IP LOGIN", client.name, client.ip); log.warn("BANNED IP LOGIN", client.name, client.ip);
ygopro.stoc_die(client, "${banned_ip_login}"); ygopro.stoc_die(client, "${banned_ip_login}");
} else if (_.any(settings.ban.badword_level3, function(badword) { } else if (_.any(badwords.level3, function(badword) {
var regexp; var regexp;
regexp = new RegExp(badword, 'i'); regexp = new RegExp(badword, 'i');
return name.match(regexp); return name.match(regexp);
}, name = client.name)) { }, name = client.name)) {
log.warn("BAD NAME LEVEL 3", client.name, client.ip); log.warn("BAD NAME LEVEL 3", client.name, client.ip);
ygopro.stoc_die(client, "${bad_name_level3}"); ygopro.stoc_die(client, "${bad_name_level3}");
} else if (_.any(settings.ban.badword_level2, function(badword) { } else if (_.any(badwords.level2, function(badword) {
var regexp; var regexp;
regexp = new RegExp(badword, 'i'); regexp = new RegExp(badword, 'i');
return name.match(regexp); return name.match(regexp);
}, name = client.name)) { }, name = client.name)) {
log.warn("BAD NAME LEVEL 2", client.name, client.ip); log.warn("BAD NAME LEVEL 2", client.name, client.ip);
ygopro.stoc_die(client, "${bad_name_level2}"); ygopro.stoc_die(client, "${bad_name_level2}");
} else if (_.any(settings.ban.badword_level1, function(badword) { } else if (_.any(badwords.level1, function(badword) {
var regexp; var regexp;
regexp = new RegExp(badword, 'i'); regexp = new RegExp(badword, 'i');
return name.match(regexp); return name.match(regexp);
...@@ -1471,8 +1568,8 @@ ...@@ -1471,8 +1568,8 @@
} else if (error || !body) { } else if (error || !body) {
log.warn('dialogues error', error, response); log.warn('dialogues error', error, response);
} else { } else {
nconf.myset(settings, "dialogues", body); setting_change(dialogues, "dialogues", body);
log.info("dialogues loaded", _.size(body)); log.info("dialogues loaded", _.size(dialogues.dialogues));
} }
}); });
}; };
...@@ -1591,8 +1688,8 @@ ...@@ -1591,8 +1688,8 @@
if (settings.modules.dialogues.enabled) { if (settings.modules.dialogues.enabled) {
if (ygopro.constants.MSG[msg] === 'SUMMONING' || ygopro.constants.MSG[msg] === 'SPSUMMONING') { if (ygopro.constants.MSG[msg] === 'SUMMONING' || ygopro.constants.MSG[msg] === 'SPSUMMONING') {
card = buffer.readUInt32LE(1); card = buffer.readUInt32LE(1);
if (settings.dialogues[card]) { if (dialogues.dialogues[card]) {
ref2 = _.lines(settings.dialogues[card][Math.floor(Math.random() * settings.dialogues[card].length)]); ref2 = _.lines(dialogues.dialogues[card][Math.floor(Math.random() * dialogues.dialogues[card].length)]);
for (j = 0, len = ref2.length; j < len; j++) { for (j = 0, len = ref2.length; j < len; j++) {
line = ref2[j]; line = ref2[j];
ygopro.stoc_send_chat(client, line, ygopro.constants.COLORS.PINK); ygopro.stoc_send_chat(client, line, ygopro.constants.COLORS.PINK);
...@@ -1772,14 +1869,14 @@ ...@@ -1772,14 +1869,14 @@
}; };
ygopro.stoc_send_random_tip = function(client) { ygopro.stoc_send_random_tip = function(client) {
if (settings.modules.tips.enabled && settings.tips.length) { if (settings.modules.tips.enabled && tips.tips.length) {
ygopro.stoc_send_chat(client, "Tip: " + settings.tips[Math.floor(Math.random() * settings.tips.length)]); ygopro.stoc_send_chat(client, "Tip: " + tips.tips[Math.floor(Math.random() * tips.tips.length)]);
} }
}; };
ygopro.stoc_send_random_tip_to_room = function(room) { ygopro.stoc_send_random_tip_to_room = function(room) {
if (settings.modules.tips.enabled && settings.tips.length) { if (settings.modules.tips.enabled && tips.tips.length) {
ygopro.stoc_send_chat_to_room(room, "Tip: " + settings.tips[Math.floor(Math.random() * settings.tips.length)]); ygopro.stoc_send_chat_to_room(room, "Tip: " + tips.tips[Math.floor(Math.random() * tips.tips.length)]);
} }
}; };
...@@ -1793,8 +1890,8 @@ ...@@ -1793,8 +1890,8 @@
} else if (error || !body) { } else if (error || !body) {
log.warn('tips error', error, response); log.warn('tips error', error, response);
} else { } else {
nconf.myset(settings, "tips", body); setting_change(tips, "tips", body);
log.info("tips loaded", settings.tips.length); log.info("tips loaded", tips.tips.length);
} }
}); });
}; };
...@@ -1984,7 +2081,7 @@ ...@@ -1984,7 +2081,7 @@
case '/ai': case '/ai':
if (settings.modules.windbot.enabled) { if (settings.modules.windbot.enabled) {
if (name = cmd[1]) { if (name = cmd[1]) {
windbot = _.sample(_.filter(settings.modules.windbots, function(w) { windbot = _.sample(_.filter(windbots, function(w) {
return w.name === name || w.deck === name; return w.name === name || w.deck === name;
})); }));
if (!windbot) { if (!windbot) {
...@@ -1992,7 +2089,7 @@ ...@@ -1992,7 +2089,7 @@
return; return;
} }
} else { } else {
windbot = _.sample(settings.modules.windbots); windbot = _.sample(windbots);
} }
room.add_windbot(windbot); room.add_windbot(windbot);
} }
...@@ -2019,7 +2116,7 @@ ...@@ -2019,7 +2116,7 @@
return true; return true;
} }
oldmsg = msg; oldmsg = msg;
if (_.any(settings.ban.badword_level3, function(badword) { if (_.any(badwords.level3, function(badword) {
var regexp; var regexp;
regexp = new RegExp(badword, 'i'); regexp = new RegExp(badword, 'i');
return msg.match(regexp); return msg.match(regexp);
...@@ -2048,7 +2145,7 @@ ...@@ -2048,7 +2145,7 @@
client.abuse_count = client.abuse_count + 2; client.abuse_count = client.abuse_count + 2;
ygopro.stoc_send_chat(client, "${chat_warn_level0}", ygopro.constants.COLORS.RED); ygopro.stoc_send_chat(client, "${chat_warn_level0}", ygopro.constants.COLORS.RED);
cancel = true; cancel = true;
} else if (_.any(settings.ban.badword_level2, function(badword) { } else if (_.any(badwords.level2, function(badword) {
var regexp; var regexp;
regexp = new RegExp(badword, 'i'); regexp = new RegExp(badword, 'i');
return msg.match(regexp); return msg.match(regexp);
...@@ -2059,7 +2156,7 @@ ...@@ -2059,7 +2156,7 @@
ygopro.stoc_send_chat(client, "${chat_warn_level2}", ygopro.constants.COLORS.RED); ygopro.stoc_send_chat(client, "${chat_warn_level2}", ygopro.constants.COLORS.RED);
cancel = true; cancel = true;
} else { } else {
_.each(settings.ban.badword_level1, function(badword) { _.each(badwords.level1, function(badword) {
var regexp; var regexp;
regexp = new RegExp(badword, "ig"); regexp = new RegExp(badword, "ig");
msg = msg.replace(regexp, "**"); msg = msg.replace(regexp, "**");
...@@ -2073,7 +2170,7 @@ ...@@ -2073,7 +2170,7 @@
struct._setBuff(buffer); struct._setBuff(buffer);
struct.set("msg", msg); struct.set("msg", msg);
buffer = struct.buffer; buffer = struct.buffer;
} else if (_.any(settings.ban.badword_level0, function(badword) { } else if (_.any(badwords.level0, function(badword) {
var regexp; var regexp;
regexp = new RegExp(badword, 'i'); regexp = new RegExp(badword, 'i');
return msg.match(regexp); return msg.match(regexp);
...@@ -2287,8 +2384,8 @@ ...@@ -2287,8 +2384,8 @@
return results; return results;
})() })()
}; };
settings.modules.tournament_mode.duel_log.unshift(duellog); duel_log.duel_log.unshift(duellog);
nconf.myset(settings, "modules:tournament_mode:duel_log", settings.modules.tournament_mode.duel_log); setting_save(duel_log);
fs.writeFile(settings.modules.tournament_mode.replay_path + replay_filename, buffer, function(err) { fs.writeFile(settings.modules.tournament_mode.replay_path + replay_filename, buffer, function(err) {
if (err) { if (err) {
return log.warn("SAVE REPLAY ERROR", replay_filename, err); return log.warn("SAVE REPLAY ERROR", replay_filename, err);
...@@ -2438,7 +2535,7 @@ ...@@ -2438,7 +2535,7 @@
return; return;
} else { } else {
response.writeHead(200); response.writeHead(200);
duellog = JSON.stringify(settings.modules.tournament_mode.duel_log, null, 2); duellog = JSON.stringify(duel_log.duel_log, null, 2);
response.end(addCallback(u.query.callback, duellog)); response.end(addCallback(u.query.callback, duellog));
} }
} else if (u.pathname === '/api/archive.zip' && settings.modules.tournament_mode.enabled) { } else if (u.pathname === '/api/archive.zip' && settings.modules.tournament_mode.enabled) {
...@@ -2451,7 +2548,7 @@ ...@@ -2451,7 +2548,7 @@
archive_name = moment().format('YYYY-MM-DD HH:mm:ss') + ".zip"; archive_name = moment().format('YYYY-MM-DD HH:mm:ss') + ".zip";
archive_args = ["a", "-mx0", "-y", archive_name]; archive_args = ["a", "-mx0", "-y", archive_name];
check = false; check = false;
ref = settings.modules.tournament_mode.duel_log; ref = duel_log.duel_log;
for (j = 0, len = ref.length; j < len; j++) { for (j = 0, len = ref.length; j < len; j++) {
replay = ref[j]; replay = ref[j];
check = true; check = true;
...@@ -2512,8 +2609,7 @@ ...@@ -2512,8 +2609,7 @@
return; return;
} else { } else {
response.writeHead(200); response.writeHead(200);
settings.modules.tournament_mode.duel_log = []; clearlog();
nconf.myset(settings, "modules:tournament_mode:duel_log", settings.modules.tournament_mode.duel_log);
response.end(addCallback(u.query.callback, "[{name:'Success'}]")); response.end(addCallback(u.query.callback, "[{name:'Success'}]"));
} }
} else if (_.startsWith(u.pathname, '/api/replay') && settings.modules.tournament_mode.enabled) { } else if (_.startsWith(u.pathname, '/api/replay') && settings.modules.tournament_mode.enabled) {
...@@ -2556,11 +2652,11 @@ ...@@ -2556,11 +2652,11 @@
if (u.query.stop === 'false') { if (u.query.stop === 'false') {
u.query.stop = false; u.query.stop = false;
} }
settings.modules.stop = u.query.stop; setting_change(settings, 'modules:stop', u.query.stop);
response.writeHead(200); response.writeHead(200);
response.end(addCallback(u.query.callback, "['stop ok', '" + u.query.stop + "']")); response.end(addCallback(u.query.callback, "['stop ok', '" + u.query.stop + "']"));
} else if (u.query.welcome) { } else if (u.query.welcome) {
nconf.myset(settings, 'modules:welcome', u.query.welcome); setting_change(settings, 'modules:welcome', u.query.welcome);
response.writeHead(200); response.writeHead(200);
response.end(addCallback(u.query.callback, "['welcome ok', '" + u.query.welcome + "']")); response.end(addCallback(u.query.callback, "['welcome ok', '" + u.query.welcome + "']"));
} else if (u.query.getwelcome) { } else if (u.query.getwelcome) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment