Merge pull request #99 from Lost-MSth/dev

Update to v2.11.1

.gitignore

@@ -18,3 +18,6 @@ __pycache__/
 # setting/config files
 latest version/config/
 latest version/config.py
+
+# song data
+latest version/database/songs/

README.md

@@ -1,7 +1,9 @@
 # Arcaea-server
+
 一个微型的Arcaea本地服务器  A small local server for Arcaea
 
 ## 简介 Introduction
+
 这是基于Python以及Flask的微型本地Arcaea服务器，可以模拟游戏的主要功能。这可能是我第一次写这种大程序，若有不妥之处，敬请谅解。  
 
 本程序主要用于学习研究，不得用于任何商业行为，否则后果自负，这不是强制要求，只是一个提醒与警告。  
@@ -14,7 +16,9 @@ This procedure is mainly used for study and research, and shall not be used for
 > It looks stupid, but it works!
 
 ## 特性 Features
+
 有以下 We have：
+
 - 登录、注册 Login and registration
 - 多设备登录 Multi device login
 - 成绩上传 Score upload
@@ -24,7 +28,7 @@ This procedure is mainly used for study and research, and shall not be used for
 - 段位系统 Course system
 - Link Play
 - 好友系统 Friends
-- 数据同步 Data synchronization
+- 云端存档 Cloud save
 - 爬梯 Climbing steps
 - 自定义世界模式 Customizable World Mode
 - 自定义歌曲下载 Customizable songs download
@@ -40,60 +44,44 @@ This procedure is mainly used for study and research, and shall not be used for
 - 服务器日志 Server log
 
 没有以下 We don't have：
+
 - 服务器安全性保证 Server security assurance
 
 可能有问题 There may be problems：
+
 - Recent 30
 - 一些歌曲的解锁 Some songs' unlocking
 - 同设备多共存登录 Multiple app logins on the same device
 
 ## 说明 Statement
+
 只是很有趣，用处探索中。  
 It is just so interesting. What it can do is under exploration.
 
-
 ## 下载 Download
+
 [这里 Here](https://github.com/Lost-MSth/Arcaea-server/releases)
 
 [Arcaea-CN official](https://arcaea.lowiro.com/zh)  
-[Arcaea-lowi.ro](https://lowi.ro)  
+[Arcaea-Konmai Academy](https://616.sb)  
-[Arcaea-RhyDown](https://rhydown.com)
 
 ## 更新日志 Update log
+
 只保留最新版本 Only keep the latest version.
 
 > 提醒：更新时请注意保留原先的数据库，以防数据丢失。
 >
 > Tips: When updating, please keep the original database in case of data loss.
 
+### Version 2.11.1
 
-### Version 2.10.1
+- 适用于Arcaea 4.4.0版本 For Arcaea 4.4.0
-- 适用于Arcaea 4.1.4版本 For Arcaea 4.1.4
+- 新搭档 **密特拉·泰尔塞拉**、**不来方斗亚** 已解锁 Unlock the character **Mithra Tercera** and **Toa Kozukata**.
-- 新搭档 **天音** 已解锁 Unlock the character **Amane**.
+- 为 **密特拉·泰尔塞拉** 的技能提供支持 Add support for the skill of **Mithra Tercera**.
-- 为**天音**技能提供支持 Add support for the skill of **Amane**.
+- 新增修改搭档的API接口 Add some API endpoints about characters.
-- 现在配置文件可以是含有部分选项的文件或模块 At present the setting file can be a module or a file with some of options.
-- 添加`waitress`和`gevent`的部署方案支持，并支持日志记录 Add deployment mode `waitress` and `gevent`, and add support for the info log recording of them.
-- 为`songlist`添加解析器以指定可下载的文件 Add a parser for `songlist` to specify downloadable files.
-- 重构数据库初始化和数据迁移部分 Code refactoring for database initialization and migration.
-- 限制用户下载频率将使用第三方限制器，替代数据库 Add a custom limiter and use it for limiting users' download rate instead of using database.
-  > 现在需要`limits`模块  
-  > Now `limits` module is required.
-- 为登录和API登录添加限制器 Add limiter for login and API login.
-- `sqlite3`数据库调整为WAL模式并增大缓存 Change journal mode to WAL and enlarge cache size for `sqlite3` database.
-- 将下载token放入内存中而不是文件数据库中 Put download token in memory database instead of filesystem database.
-- 加速`best_score`表多次查询，表现为歌曲排行榜查询性能提升 Accelerate multiple querying in `best_score` table, which results in performance improvement of song ranklist query.
-- 优化歌曲下载部分 Make some optimization for downloading songs.
-- **修复更新recent 10时可能出现的死循环问题 Fix a bug that there is a endless loop in calculating recent 10 updating.** (due to 6fcca179182775615115cdb255b3a8223831a8a0)
-- 修复课题模式成绩没有rating的问题 Fix a bug that scores in course mode cannot calculate rating.
-- 修正搭档数值 Fix a character's value.
-- 邮箱长度最大限制提升到64 Change the email max length to 64.
-- 新增API接口来获取用户身份与权限 Add a method of API for getting users' roles and powers.
-- 新增API接口来修改用户信息 Add a method of API to change the user's info.
-- 为API的`GET`请求添加`query`参数支持 Add support for the `query` param in API's `GET` requests.
-- 修复API的`best30`接口曲目无数据导致出错的问题 Fix a bug that `best30` of API cannot have scores whose songs are not in database.
-- 修复API的`recent30`接口用户成绩数量不足导致出错的问题 Fix a bug that users with no recent scores cannot get `recent30` via API.
 
 ## 运行环境与依赖 Running environment and requirements
+
 - Windows/Linux/Mac OS/Android...
 - Python >= 3.6
 - Flask module >= 2.0, Cryptography module >= 3.0.0, limits >= 2.7.0
@@ -106,34 +94,41 @@ It is just so interesting. What it can do is under exploration.
 -->
 
 ## 使用说明 Instruction for use
+
 [中文](https://github.com/Lost-MSth/Arcaea-server/wiki/%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E)  
 [English](https://github.com/Lost-MSth/Arcaea-server/wiki/Instruction-for-use)
 
 ## 注意 Attentions
+
 [中文](https://github.com/Lost-MSth/Arcaea-server/wiki/%E6%B3%A8%E6%84%8F)  
 [English](https://github.com/Lost-MSth/Arcaea-server/wiki/Attentions)
 
-
 ## Q&A
+
 [中文/English](https://github.com/Lost-MSth/Arcaea-server/wiki/Q&A)
 
-
 ## 鸣谢 Thanks
-~~歌曲数据库来自 Using song database from
+
-[BotArcAPI releases](https://github.com/TheSnowfield/BotArcAPI/releases)~~
+歌曲数据库来自 Using song database from
+~~[BotArcAPI releases](https://github.com/TheSnowfield/BotArcAPI/releases)~~
+[ArcaeaSongDatabase](https://github.com/Arcaea-Infinity/ArcaeaSongDatabase)
+
 > 从v2.9开始不再提供歌曲数据  
 > Since v2.9, song data will not be provided.
 
 网站图标来自 Using favicon from [black fate - てんてん - pixiv](https://www.pixiv.net/artworks/82374369)
 
 ## 联系方式 Contact
+
 如有必要，可以联系本人 Contact me if necessary  
 邮箱 Email：th84292@foxmail.com
 
 ## 支持一下 Support me
+
 生活不易。 Life is not easy.  
 [支付宝 Alipay](https://github.com/Lost-MSth/Arcaea-server/blob/master/pic/Alipay.jpg)  
 [微信 WeChat](https://github.com/Lost-MSth/Arcaea-server/blob/master/pic/WeChat.png)
 
 ## 使用许可 Use license
+
 [MIT](LICENSE) © Lost

latest version/api/__init__.py

@@ -1,10 +1,15 @@
 from flask import Blueprint
 
-from . import users
+from . import (users, songs, token, system, items,
-from . import songs
+               purchases, presents, redeems, characters)
-from . import token
 
 bp = Blueprint('api', __name__, url_prefix='/api/v1')
 bp.register_blueprint(users.bp)
 bp.register_blueprint(songs.bp)
 bp.register_blueprint(token.bp)
+bp.register_blueprint(system.bp)
+bp.register_blueprint(items.bp)
+bp.register_blueprint(purchases.bp)
+bp.register_blueprint(presents.bp)
+bp.register_blueprint(redeems.bp)
+bp.register_blueprint(characters.bp)

latest version/api/api_auth.py

@@ -1,15 +1,17 @@
-from functools import wraps
-from traceback import format_exc
 from base64 import b64decode
+from functools import wraps
 from json import loads
+from traceback import format_exc
+
+from flask import current_app
 
 from core.api_user import APIUser
 from core.config_manager import Config
-from core.error import ArcError, NoAccess, PostError
+from core.error import ArcError, InputError, NoAccess, PostError
 from core.sql import Connect
-from flask import current_app
 
 from .api_code import error_return
+from .constant import Constant
 
 
 def role_required(request, powers=[]):
@@ -48,13 +50,15 @@ def role_required(request, powers=[]):
     return decorator
 
 
-def request_json_handle(request, required_keys=[], optional_keys=[]):
+def request_json_handle(request, required_keys: list = [], optional_keys: list = [], must_change: bool = False, is_batch: bool = False):
     '''
-        提取post参数，返回dict，写成了修饰器\ 
+        提取post参数，返回dict，写成了修饰器
-        parameters: \ 
+
-        `request`: `Request` - 当前请求\ 
+        parameters:
-        `required_keys`: `list` - 必须的参数\ 
+        `request`: `Request` - 当前请求
+        `required_keys`: `list` - 必须的参数
         `optional_keys`: `list` - 可选的参数
+        `must_change`: `bool` - 当全都是可选参数时，是否必须有至少一项修改
     '''
 
     def decorator(view):
@@ -63,24 +67,39 @@ def request_json_handle(request, required_keys=[], optional_keys=[]):
 
             data = {}
             if request.data:
-                json_data = request.json
+                json_data = request.get_json()
             else:
                 if request.method == 'GET' and 'query' in request.args:
                     # 处理axios没法GET传data的问题
+                    try:
                         json_data = loads(
                             b64decode(request.args['query']).decode())
+                    except:
+                        raise PostError(api_error_code=-105)
                 else:
                     json_data = {}
 
             for key in required_keys:
                 if key not in json_data:
-                    return error_return(PostError(f'Missing parameter: {key}', api_error_code=-100))
+                    return error_return(InputError(f'Missing parameter: {key}', api_error_code=-100))
                 data[key] = json_data[key]
 
+            if is_batch:
+                for key in Constant.PATCH_KEYS:
+                    if key in json_data:
+                        data[key] = json_data[key]
+                        if not isinstance(data[key], list):
+                            return error_return(InputError(f'Parameter {key} must be a list', api_error_code=-100))
+                if not data:
+                    return error_return(InputError('No change', api_error_code=-100))
+            else:
                 for key in optional_keys:
                     if key in json_data:
                         data[key] = json_data[key]
 
+                if must_change and not data:
+                    return error_return(InputError('No change', api_error_code=-100))
+
             return view(data, *args, **kwargs)
 
         return wrapped_view
@@ -95,7 +114,6 @@ def api_try(view):
             data = view(*args, **kwargs)
             if data is None:
                 return error_return()
-            else:
             return data
         except ArcError as e:
             if Config.ALLOW_WARNING_LOG:

latest version/api/api_code.py

@@ -1,6 +1,7 @@
-from core.error import ArcError
 from flask import jsonify
 
+from core.error import ArcError
+
 default_error = ArcError('Unknown Error')
 
 
@@ -9,6 +10,7 @@ CODE_MSG = {
     -1: 'See status code',  # 基础错误
     -2: 'No data',
     -3: 'No data or user',  # 不确定是无数据还是无用户
+    -4: 'Data exist',
     -100: 'Invalid post data',  # 1xx数据错误
     -101: 'Invalid data type',
     -102: 'Invalid query parameter',
@@ -16,6 +18,13 @@ CODE_MSG = {
     -104: 'Invalid sort order parameter',
     -105: 'Invalid URL parameter',
     -110: 'Invalid user_id',
+    -120: 'Invalid item type',
+    -121: 'No such item',
+    -122: 'Item already exists',
+    -123: 'The collection already has this item',
+    -124: 'The collection does not have this item',
+    -130: 'No such character',
+    -131: 'Invalid skill ID',
     -200: 'No permission',  # 2xx用户相关错误
     -201: 'Wrong username or password',
     -202: 'User is banned',

latest version/api/characters.py

@@ -0,0 +1,134 @@
+from flask import Blueprint, request
+
+from core.error import InputError, NoData
+from core.item import ItemFactory
+from core.character import Character
+from core.sql import Connect, Query, Sql
+
+from .api_auth import api_try, request_json_handle, role_required
+from .api_code import success_return
+from .constant import Constant
+
+
+bp = Blueprint('characters', __name__, url_prefix='/characters')
+
+
+@bp.route('', methods=['GET'])
+@role_required(request, ['select'])
+@request_json_handle(request, optional_keys=Constant.QUERY_KEYS)
+@api_try
+def characters_get(data, user):
+    '''查询全角色信息'''
+    A = ['character_id', 'name', 'skill_id',
+         'skill_id_uncap', 'char_type', 'is_uncapped']
+    B = ['name', 'skill_id', 'skill_id_uncap']
+    C = ['name', 'frag1', 'prog1', 'overdrive1', 'frag20',
+         'prog20', 'overdrive20', 'frag30', 'prog30', 'overdrive30']
+    with Connect() as c:
+        query = Query(A, B, C).from_dict(data)
+        x = Sql(c).select('character', query=query)
+        r = [Character().from_list(i) for i in x]
+
+        if not r:
+            raise NoData(api_error_code=-2)
+
+        return success_return([x.to_dict() for x in r])
+
+
+@bp.route('/<int:character_id>', methods=['GET'])
+@role_required(request, ['select'])
+@api_try
+def characters_character_get(user, character_id: int):
+    # 包含core
+    with Connect() as c:
+        c = Character(c).select(character_id)
+        c.select_character_core()
+        return success_return(c.to_dict(has_cores=True))
+
+
+@bp.route('/<int:character_id>', methods=['PUT'])
+@role_required(request, ['change'])
+@request_json_handle(request, optional_keys=['max_level', 'skill_id', 'skill_id_uncap', 'skill_unlock_level', 'skill_requires_uncap', 'char_type', 'is_uncapped', 'frag1', 'prog1', 'overdrive1', 'frag20', 'prog20', 'overdrive20', 'frag30', 'prog30', 'overdrive30'], must_change=True)
+@api_try
+def characters_character_put(data, user, character_id: int):
+    '''修改角色信息'''
+    if ('skill_id' in data and data['skill_id'] != '' and data['skill_id'] not in Constant.SKILL_IDS) or ('skill_id_uncap' in data and data['skill_id_uncap'] != '' and data['skill_id_uncap'] not in Constant.SKILL_IDS):
+        raise InputError('Invalid skill_id', api_error_code=-131)
+    with Connect() as c:
+        c = Character(c).select(character_id)
+        try:
+            if 'max_level' in data:
+                c.max_level = int(data['max_level'])
+            if 'skill_id' in data:
+                c.skill_id = data['skill_id']
+            if 'skill_id_uncap' in data:
+                c.skill_id_uncap = data['skill_id_uncap']
+            if 'skill_unlock_level' in data:
+                c.skill_unlock_level = int(data['skill_unlock_level'])
+            if 'skill_requires_uncap' in data:
+                c.skill_requires_uncap = data['skill_requires_uncap'] == 1
+            if 'char_type' in data:
+                c.char_type = int(data['char_type'])
+            if 'is_uncapped' in data:
+                c.is_uncapped = data['is_uncapped'] == 1
+            t = ['frag1', 'prog1', 'overdrive1', 'frag20', 'prog20',
+                 'overdrive20', 'frag30', 'prog30', 'overdrive30']
+            for i in t:
+                if i not in data:
+                    continue
+                if i.endswith('1'):
+                    x = getattr(c, i[:-1])
+                    x.start = float(data[i])
+                elif i.endswith('20'):
+                    x = getattr(c, i[:-2])
+                    x.mid = float(data[i])
+                else:
+                    x = getattr(c, i[:-2])
+                    x.end = float(data[i])
+        except ValueError as e:
+            raise InputError('Invalid input', api_error_code=-101) from e
+        c.update()
+        return success_return(c.to_dict())
+
+
+@bp.route('/<int:character_id>/cores', methods=['GET'])
+@role_required(request, ['select'])
+@api_try
+def characters_character_cores_get(user, character_id: int):
+    with Connect() as c:
+        c = Character(c)
+        c.character_id = character_id
+        c.select_character_core()
+        return success_return(c.uncap_cores_to_dict())
+
+
+@bp.route('/<int:character_id>/cores', methods=['PATCH'])
+@role_required(request, ['change'])
+@request_json_handle(request, is_batch=True)
+@api_try
+def characters_character_cores_patch(data, user, character_id: int):
+    '''修改角色觉醒cores'''
+    def force_type_core(x: dict) -> dict:
+        x['item_type'] = 'core'
+        x['type'] = 'core'
+        return x
+
+    with Connect() as c:
+        ch = Character(c)
+        ch.character_id = character_id
+        ch.select_character_core()
+        ch.remove_items([ItemFactory.from_dict(x, c=c)
+                         for x in map(force_type_core, data.get('remove', []))])
+        ch.add_items([ItemFactory.from_dict(x, c=c)
+                      for x in map(force_type_core, data.get('create', []))])
+        updates = list(map(force_type_core, data.get('update', [])))
+        for x in updates:
+            if 'amount' not in x:
+                raise InputError('`amount` is required in `update`')
+            if not isinstance(x['amount'], int) or x['amount'] <= 0:
+                raise InputError(
+                    '`amount` must be a positive integer', api_error_code=-101)
+
+        ch.update_items(
+            [ItemFactory.from_dict(x, c=c) for x in updates])
+        return success_return(ch.uncap_cores_to_dict())

latest version/api/constant.py

@@ -1,2 +1,7 @@
 class Constant:
     QUERY_KEYS = ['limit', 'offset', 'query', 'fuzzy_query', 'sort']
+
+    PATCH_KEYS = ['create', 'update', 'remove']
+
+    SKILL_IDS = ['gauge_easy', 'note_mirror', 'gauge_hard', 'frag_plus_10_pack_stellights', 'gauge_easy|frag_plus_15_pst&prs', 'gauge_hard|fail_frag_minus_100', 'frag_plus_5_side_light', 'visual_hide_hp', 'frag_plus_5_side_conflict', 'challenge_fullcombo_0gauge', 'gauge_overflow', 'gauge_easy|note_mirror', 'note_mirror', 'visual_tomato_pack_tonesphere', 'frag_rng_ayu', 'gaugestart_30|gaugegain_70', 'combo_100-frag_1', 'audio_gcemptyhit_pack_groovecoaster', 'gauge_saya', 'gauge_chuni', 'kantandeshou', 'gauge_haruna', 'frags_nono', 'gauge_pandora', 'gauge_regulus', 'omatsuri_daynight',
+                 'sometimes(note_mirror|frag_plus_5)', 'scoreclear_aa|visual_scoregauge', 'gauge_tempest', 'gauge_hard', 'gauge_ilith_summer', 'frags_kou', 'visual_ink', 'shirabe_entry_fee', 'frags_yume', 'note_mirror|visual_hide_far', 'frags_ongeki', 'gauge_areus', 'gauge_seele', 'gauge_isabelle', 'gauge_exhaustion', 'skill_lagrange', 'gauge_safe_10', 'frags_nami', 'skill_elizabeth', 'skill_lily', 'skill_kanae_midsummer', 'eto_uncap', 'luna_uncap', 'frags_preferred_song', 'visual_ghost_skynotes', 'ayu_uncap', 'skill_vita', 'skill_fatalis', 'skill_reunion', 'frags_ongeki_slash', 'frags_ongeki_hard', 'skill_amane', 'skill_kou_winter', 'gauge_hard|note_mirror', 'skill_shama', 'skill_milk', 'skill_shikoku', 'skill_mika', 'ilith_awakened_skill', 'skill_mithra', 'skill_toa']

latest version/api/items.py

@@ -0,0 +1,115 @@
+from flask import Blueprint, request
+
+from core.error import DataExist, InputError, NoData
+from core.item import Item, ItemFactory
+from core.sql import Connect, Query, Sql
+
+from .api_auth import api_try, request_json_handle, role_required
+from .api_code import success_return
+from .constant import Constant
+
+bp = Blueprint('items', __name__, url_prefix='/items')
+
+
+@bp.route('', methods=['GET'])
+@role_required(request, ['select'])
+@request_json_handle(request, optional_keys=Constant.QUERY_KEYS)
+@api_try
+def items_get(data, user):
+    '''查询全物品信息'''
+    with Connect() as c:
+        query = Query(['item_id', 'type'], ['item_id'],
+                      ['item_id']).from_dict(data)
+        x = Sql(c).select('item', query=query)
+        r: 'list[Item]' = []
+        for i in x:
+            r.append(ItemFactory.from_dict({
+                'item_id': i[0],
+                'type': i[1],
+                'is_available': i[2] == 1
+            }))
+
+        if not r:
+            raise NoData(api_error_code=-2)
+
+        return success_return([x.to_dict(has_is_available=True, has_amount=False) for x in r])
+
+
+ALLOW_ITEM_TYPE = ['pack', 'single', 'world_song', 'character']
+
+
+@bp.route('', methods=['POST'])
+@role_required(request, ['change'])
+@request_json_handle(request, required_keys=['item_id', 'type'], optional_keys=['is_available'])
+@api_try
+def items_post(data, user):
+    '''新增物品'''
+    if data['type'] not in ALLOW_ITEM_TYPE:
+        raise InputError(
+            f'Invalid item type: `{data["type"]}`', api_error_code=-120)
+    with Connect() as c:
+        item = ItemFactory.from_dict(data, c=c)
+        if item.select_exists():
+            raise DataExist(
+                f'Item `{item.item_type}`: `{item.item_id}` already exists', api_error_code=-122)
+        item.insert()
+        return success_return(item.to_dict(has_is_available=True, has_amount=False))
+
+
+@bp.route('/<string:item_type>/<string:item_id>', methods=['DELETE'])
+@role_required(request, ['change'])
+@api_try
+def items_item_delete(user, item_type, item_id):
+    '''删除物品'''
+    if item_type not in ALLOW_ITEM_TYPE:
+        raise InputError(
+            f'Invalid item type: `{item_type}`', api_error_code=-120)
+    with Connect() as c:
+        item = ItemFactory.from_dict({
+            'item_id': item_id,
+            'type': item_type
+        }, c=c)
+        if not item.select_exists():
+            raise NoData(
+                f'No such item `{item_type}`: `{item_id}`', api_error_code=-121)
+        item.delete()
+        return success_return()
+
+
+@bp.route('/<string:item_type>/<string:item_id>', methods=['PUT'])
+@role_required(request, ['change'])
+@request_json_handle(request, optional_keys=['is_available'], must_change=True)
+@api_try
+def items_item_put(data, user, item_type, item_id):
+    '''修改物品'''
+    if item_type not in ALLOW_ITEM_TYPE:
+        raise InputError(
+            f'Invalid item type: `{item_type}`', api_error_code=-120)
+    if not isinstance(data['is_available'], bool):
+        raise InputError('`is_available` must be a boolean',
+                         api_error_code=-101)
+    with Connect() as c:
+        item = ItemFactory.from_dict({
+            'item_id': item_id,
+            'type': item_type,
+            'is_available': data['is_available']
+        }, c=c)
+        if not item.select_exists():
+            raise NoData(
+                f'No such item `{item_type}`: `{item_id}`', api_error_code=-121)
+        item.update()
+        return success_return(item.to_dict(has_is_available=True, has_amount=False))
+
+
+@bp.route('/<string:item_type>/<string:item_id>', methods=['GET'])
+@role_required(request, ['select'])
+@api_try
+def items_item_get(user, item_type, item_id):
+    '''查询单个物品信息'''
+    with Connect() as c:
+        item = ItemFactory.from_dict({
+            'item_id': item_id,
+            'type': item_type
+        }, c=c)
+        item.select()
+        return success_return(item.to_dict(has_is_available=True, has_amount=False))

latest version/api/presents.py

@@ -0,0 +1,122 @@
+from flask import Blueprint, request
+
+from core.error import DataExist, InputError, NoData
+from core.item import ItemFactory
+from core.present import Present
+from core.sql import Connect, Query, Sql
+
+from .api_auth import api_try, request_json_handle, role_required
+from .api_code import success_return
+from .constant import Constant
+
+
+bp = Blueprint('presents', __name__, url_prefix='/presents')
+
+
+@bp.route('', methods=['GET'])
+@role_required(request, ['select'])
+@request_json_handle(request, optional_keys=Constant.QUERY_KEYS)
+@api_try
+def presents_get(data, user):
+    '''查询全present信息'''
+    with Connect() as c:
+        query = Query(['present_id'], ['present_id', 'description'], [
+                      'present_id', 'expire_ts']).from_dict(data)
+        x = Sql(c).select('present', query=query)
+        r = [Present().from_list(i) for i in x]
+
+        if not r:
+            raise NoData(api_error_code=-2)
+
+        return success_return([x.to_dict(has_items=False) for x in r])
+
+
+@bp.route('', methods=['POST'])
+@role_required(request, ['insert'])
+@request_json_handle(request, required_keys=['present_id', 'description', 'expire_ts'], optional_keys=['items'])
+@api_try
+def presents_post(data, user):
+    '''添加present，注意可以有items，不存在的item会自动创建'''
+    with Connect() as c:
+        p = Present(c).from_dict(data)
+        if p.select_exists():
+            raise DataExist(
+                f'Present `{p.present_id}` already exists')
+        p.insert_all()
+        return success_return(p.to_dict(has_items='items' in data))
+
+
+@bp.route('/<string:present_id>', methods=['GET'])
+@role_required(request, ['select'])
+@api_try
+def presents_present_get(user, present_id: str):
+    '''查询单个present信息'''
+    with Connect() as c:
+        p = Present(c).select(present_id)
+        p.select_items()
+        return success_return(p.to_dict())
+
+
+@bp.route('/<string:present_id>', methods=['DELETE'])
+@role_required(request, ['delete'])
+@api_try
+def presents_present_delete(user, present_id: str):
+    '''删除present，会连带删除present_item'''
+    with Connect() as c:
+        Present(c).select(present_id).delete_all()
+        return success_return()
+
+
+@bp.route('/<string:present_id>', methods=['PUT'])
+@role_required(request, ['change'])
+@request_json_handle(request, optional_keys=['description', 'expire_ts'], must_change=True)
+@api_try
+def presents_present_put(data, user, present_id: str):
+    '''更新present信息，注意不能有items'''
+    with Connect() as c:
+        p = Present(c).select(present_id)
+        if 'description' in data:
+            p.description = str(data['description'])
+        if 'expire_ts' in data:
+            p.expire_ts = int(data['expire_ts'])
+        p.update()
+        return success_return(p.to_dict(has_items=False))
+
+
+@bp.route('/<string:present_id>/items', methods=['GET'])
+@role_required(request, ['select'])
+@api_try
+def presents_present_items_get(user, present_id: str):
+    '''查询present的items'''
+    with Connect() as c:
+        p = Present(c)
+        p.present_id = present_id
+        p.select_items()
+        return success_return([x.to_dict(has_is_available=True) for x in p.items])
+
+
+@bp.route('/<string:present_id>/items', methods=['PATCH'])
+@role_required(request, ['change'])
+@request_json_handle(request, is_batch=True)
+@api_try
+def presents_present_items_patch(data, user, present_id: str):
+    '''增删改单个present的items'''
+    with Connect() as c:
+        p = Present(c)
+        p.present_id = present_id
+        p.select_items()
+        p.remove_items([ItemFactory.from_dict(x, c=c)
+                        for x in data.get('remove', [])])
+        p.add_items([ItemFactory.from_dict(x, c=c)
+                     for x in data.get('create', [])])
+
+        updates = data.get('update', [])
+        for x in updates:
+            if 'amount' not in x:
+                raise InputError('`amount` is required in `update`')
+            if not isinstance(x['amount'], int) or x['amount'] <= 0:
+                raise InputError(
+                    '`amount` must be a positive integer', api_error_code=-101)
+
+        p.update_items([ItemFactory.from_dict(x, c=c) for x in updates])
+        return success_return([x.to_dict(has_is_available=True) for x in p.items])

latest version/api/purchases.py

@@ -0,0 +1,163 @@
+from flask import Blueprint, request
+
+from core.error import DataExist, InputError, NoData
+from core.item import ItemFactory
+from core.purchase import Purchase
+from core.sql import Connect, Query, Sql
+
+from .api_auth import api_try, request_json_handle, role_required
+from .api_code import success_return
+from .constant import Constant
+
+bp = Blueprint('purchases', __name__, url_prefix='/purchases')
+
+
+@bp.route('', methods=['GET'])
+@role_required(request, ['select'])
+@request_json_handle(request, optional_keys=Constant.QUERY_KEYS)
+@api_try
+def purchases_get(data, user):
+    '''查询全购买信息'''
+    with Connect() as c:
+        query = Query(['purchase_name', 'discount_reason'], ['purchase_name'], [
+                      'purchase_name', 'price', 'orig_price', 'discount_from', 'discount_to']).from_dict(data)
+        x = Sql(c).select('purchase', query=query)
+        r = [Purchase().from_list(i) for i in x]
+
+        if not r:
+            raise NoData(api_error_code=-2)
+
+        return success_return([x.to_dict(has_items=False, show_real_price=False) for x in r])
+
+
+@bp.route('', methods=['POST'])
+@role_required(request, ['change'])
+@request_json_handle(request, required_keys=['purchase_name', 'orig_price'], optional_keys=['price', 'discount_from', 'discount_to', 'discount_reason', 'items'])
+@api_try
+def purchases_post(data, user):
+    '''新增购买，注意可以有items，不存在的item会自动创建'''
+    with Connect() as c:
+        purchase = Purchase(c).from_dict(data)
+        if purchase.select_exists():
+            raise DataExist(
+                f'Purchase `{purchase.purchase_name}` already exists')
+        purchase.insert_all()
+        return success_return(purchase.to_dict(has_items='items' in data, show_real_price=False))
+
+
+@bp.route('/<string:purchase_name>', methods=['GET'])
+@role_required(request, ['select'])
+@api_try
+def purchases_purchase_get(user, purchase_name: str):
+    '''查询单个购买信息'''
+    with Connect() as c:
+        return success_return(Purchase(c).select(purchase_name).to_dict(show_real_price=False))
+
+
+@bp.route('/<string:purchase_name>', methods=['DELETE'])
+@role_required(request, ['change'])
+@api_try
+def purchases_purchase_delete(user, purchase_name: str):
+    '''删除单个购买信息，会连带删除purchase_item'''
+    with Connect() as c:
+        Purchase(c).select(purchase_name).delete_all()
+        return success_return()
+
+
+@bp.route('/<string:purchase_name>', methods=['PUT'])
+@role_required(request, ['change'])
+@request_json_handle(request, optional_keys=['price', 'orig_price', 'discount_from', 'discount_to', 'discount_reason'], must_change=True)
+@api_try
+def purchases_purchase_put(data, user, purchase_name: str):
+    '''修改单个购买信息，注意不能有items'''
+    with Connect() as c:
+        purchase = Purchase(c).select(purchase_name)
+        t = ['price', 'orig_price', 'discount_from', 'discount_to']
+        for i in t:
+            if i in data:
+                setattr(purchase, i, int(data[i]))
+        if 'discount_reason' in data:
+            purchase.discount_reason = str(data['discount_reason'])
+
+        purchase.update()
+        return success_return(purchase.to_dict(has_items=False, show_real_price=False))
+
+
+@bp.route('/<string:purchase_name>/items', methods=['GET'])
+@role_required(request, ['select'])
+@api_try
+def purchases_purchase_items_get(user, purchase_name: str):
+    '''查询单个购买的所有items'''
+    with Connect() as c:
+        p = Purchase(c)
+        p.purchase_name = purchase_name
+        p.select_items()
+        return success_return([x.to_dict(has_is_available=True) for x in p.items])
+
+
+# @bp.route('/<string:purchase_name>/items', methods=['POST'])
+# @role_required(request, ['change'])
+# @request_json_handle(request, required_keys=['item_id', 'type'], optional_keys=['amount'])
+# @api_try
+# def purchases_purchase_items_post(data, user, purchase_name: str):
+#     '''新增单个购买的批量items'''
+#     with Connect() as c:
+#         p = Purchase(c)
+#         p.purchase_name = purchase_name
+#         p.select_items()
+#         p.add_items([ItemFactory().from_dict(data)])
+#         return success_return([x.to_dict(has_is_available=True) for x in p.items])
+
+
+@bp.route('/<string:purchase_name>/items', methods=['PATCH'])
+@role_required(request, ['change'])
+@request_json_handle(request, is_batch=True)
+@api_try
+def purchases_purchase_items_patch(data, user, purchase_name: str):
+    '''增删改单个购买的批量items'''
+    with Connect() as c:
+        p = Purchase(c)
+        p.purchase_name = purchase_name
+        p.select_items()
+        p.remove_items([ItemFactory.from_dict(x, c=c)
+                        for x in data.get('remove', [])])
+        p.add_items([ItemFactory.from_dict(x, c=c)
+                     for x in data.get('create', [])])
+
+        updates = data.get('update', [])
+        for x in updates:
+            if 'amount' not in x:
+                raise InputError('`amount` is required in `update`')
+            if not isinstance(x['amount'], int) or x['amount'] <= 0:
+                raise InputError(
+                    '`amount` must be a positive integer', api_error_code=-101)
+
+        p.update_items([ItemFactory.from_dict(x, c=c) for x in updates])
+        return success_return([x.to_dict(has_is_available=True) for x in p.items])
+
+
+# @bp.route('/<string:purchase_name>/items/<string:item_type>/<string:item_id>', methods=['DELETE'])
+# @role_required(request, ['change'])
+# @api_try
+# def purchases_purchase_items_item_delete(user, purchase_name: str, item_type: str, item_id: str):
+#     '''删除单个购买的单个item'''
+#     with Connect() as c:
+#         p = Purchase(c)
+#         p.purchase_name = purchase_name
+#         p.select_items()
+#         p.delete_items([ItemFactory().from_dict(
+#             {'item_type': item_type, 'item_id': item_id})])
+#         return success_return()
+
+
+# @bp.route('/<string:purchase_name>/items/<string:item_type>/<string:item_id>', methods=['PUT'])
+# @role_required(request, ['change'])
+# @request_json_handle(request, optional_keys=['amount', 'is_available'], must_change=True)
+# @api_try
+# def purchases_purchase_items_item_put(data, user, purchase_name: str, item_type: str, item_id: str):
+#     '''修改单个购买的单个item'''
+#     with Connect() as c:
+#         p = Purchase(c)
+#         p.purchase_name = purchase_name
+#         pass
+#         return success_return()

latest version/api/redeems.py

@@ -0,0 +1,119 @@
+from flask import Blueprint, request
+
+from core.error import DataExist, InputError, NoData
+from core.item import ItemFactory
+from core.redeem import Redeem
+from core.sql import Connect, Query, Sql
+
+from .api_auth import api_try, request_json_handle, role_required
+from .api_code import success_return
+from .constant import Constant
+
+
+bp = Blueprint('redeems', __name__, url_prefix='/redeems')
+
+
+@bp.route('', methods=['GET'])
+@role_required(request, ['select'])
+@request_json_handle(request, optional_keys=Constant.QUERY_KEYS)
+@api_try
+def redeems_get(data, user):
+    '''查询全redeem信息'''
+    with Connect() as c:
+        query = Query(['code', 'type'], ['code'], ['code']).from_dict(data)
+        x = Sql(c).select('redeem', query=query)
+        r = [Redeem().from_list(i) for i in x]
+
+        if not r:
+            raise NoData(api_error_code=-2)
+
+        return success_return([x.to_dict(has_items=False) for x in r])
+
+
+@bp.route('', methods=['POST'])
+@role_required(request, ['insert'])
+@request_json_handle(request, required_keys=['code', 'type'], optional_keys=['items'])
+@api_try
+def redeems_post(data, user):
+    '''添加redeem，注意可以有items，不存在的item会自动创建'''
+    with Connect() as c:
+        r = Redeem(c).from_dict(data)
+        if r.select_exists():
+            raise DataExist(
+                f'redeem `{r.code}` already exists')
+        r.insert_all()
+        return success_return(r.to_dict(has_items='items' in data))
+
+
+@bp.route('/<string:code>', methods=['GET'])
+@role_required(request, ['select'])
+@api_try
+def redeems_redeem_get(user, code: str):
+    '''查询单个redeem信息'''
+    with Connect() as c:
+        r = Redeem(c).select(code)
+        r.select_items()
+        return success_return(r.to_dict())
+
+
+@bp.route('/<string:code>', methods=['DELETE'])
+@role_required(request, ['delete'])
+@api_try
+def redeems_redeem_delete(user, code: str):
+    '''删除redeem，会连带删除redeem_item'''
+    with Connect() as c:
+        Redeem(c).select(code).delete_all()
+        return success_return()
+
+
+@bp.route('/<string:code>', methods=['PUT'])
+@role_required(request, ['change'])
+@request_json_handle(request, optional_keys=['type'], must_change=True)
+@api_try
+def redeems_redeem_put(data, user, code: str):
+    '''更新redeem信息，注意不能有items'''
+    with Connect() as c:
+        r = Redeem(c).select(code)
+        if 'type' in data:
+            r.redeem_type = int(data['type'])
+        r.update()
+        return success_return(r.to_dict(has_items=False))
+
+
+@bp.route('/<string:code>/items', methods=['GET'])
+@role_required(request, ['select'])
+@api_try
+def redeems_redeem_items_get(user, code: str):
+    '''查询redeem的items'''
+    with Connect() as c:
+        r = Redeem(c)
+        r.code = code
+        r.select_items()
+        return success_return([x.to_dict(has_is_available=True) for x in r.items])
+
+
+@bp.route('/<string:code>/items', methods=['PATCH'])
+@role_required(request, ['change'])
+@request_json_handle(request, is_batch=True)
+@api_try
+def redeems_redeem_items_patch(data, user, code: str):
+    '''增删改单个redeem的items'''
+    with Connect() as c:
+        r = Redeem(c)
+        r.code = code
+        r.select_items()
+        r.remove_items([ItemFactory.from_dict(x, c=c)
+                        for x in data.get('remove', [])])
+        r.add_items([ItemFactory.from_dict(x, c=c)
+                     for x in data.get('create', [])])
+
+        updates = data.get('update', [])
+        for x in updates:
+            if 'amount' not in x:
+                raise InputError('`amount` is required in `update`')
+            if not isinstance(x['amount'], int) or x['amount'] <= 0:
+                raise InputError(
+                    '`amount` must be a positive integer', api_error_code=-101)
+
+        r.update_items([ItemFactory.from_dict(x, c=c) for x in updates])
+        return success_return([x.to_dict(has_is_available=True) for x in r.items])

latest version/api/songs.py

@@ -1,7 +1,9 @@
-from core.error import NoData
+from flask import Blueprint, request
+
+from core.error import DataExist, InputError, NoData
+from core.rank import RankList
 from core.song import Song
 from core.sql import Connect, Query, Sql
-from flask import Blueprint, request
 
 from .api_auth import api_try, request_json_handle, role_required
 from .api_code import success_return
@@ -20,6 +22,39 @@ def songs_song_get(user, song_id):
         return success_return(s.to_dict())
 
 
+@bp.route('/<string:song_id>', methods=['PUT'])
+@role_required(request, ['change'])
+@request_json_handle(request, optional_keys=['name', 'charts'], must_change=True)
+@api_try
+def songs_song_put(data, user, song_id):
+    '''修改歌曲信息'''
+    with Connect() as c:
+        s = Song(c, song_id).select()
+        if 'name' in data:
+            s.name = str(data['name'])
+        if 'charts' in data:
+            for i in data['charts']:
+                if 'difficulty' in i and 'chart_const' in i:
+                    s.charts[i['difficulty']].defnum = round(
+                        i['chart_const'] * 10)
+
+        s.update()
+        return success_return(s.to_dict())
+
+
+@bp.route('/<string:song_id>', methods=['DELETE'])
+@role_required(request, ['change'])
+@api_try
+def songs_song_delete(user, song_id):
+    '''删除歌曲信息'''
+    with Connect() as c:
+        s = Song(c, song_id)
+        if not s.select_exists():
+            raise NoData(f'No such song: `{song_id}`')
+        s.delete()
+        return success_return()
+
+
 @bp.route('', methods=['GET'])
 @role_required(request, ['select', 'select_song_info'])
 @request_json_handle(request, optional_keys=Constant.QUERY_KEYS)
@@ -40,3 +75,41 @@ def songs_get(data, user):
             raise NoData(api_error_code=-2)
 
         return success_return([x.to_dict() for x in r])
+
+
+@bp.route('', methods=['POST'])
+@role_required(request, ['change'])
+@request_json_handle(request, ['song_id', 'charts'], ['name'])
+@api_try
+def songs_post(data, user):
+    '''添加歌曲信息'''
+    with Connect() as c:
+        s = Song(c).from_dict(data)
+        if s.select_exists():
+            raise DataExist(f'Song `{s.song_id}` already exists')
+        s.insert()
+        return success_return(s.to_dict())
+
+
+@bp.route('/<string:song_id>/<int:difficulty>/rank', methods=['GET'])
+@role_required(request, ['select', 'select_song_rank', 'select_song_rank_top'])
+@request_json_handle(request, optional_keys=['limit'])
+@api_try
+def songs_song_difficulty_rank_get(data, user, song_id, difficulty):
+    '''查询歌曲某个难度的成绩排行榜，和游戏内接口相似，只允许limit'''
+    if difficulty not in [0, 1, 2, 3]:
+        raise InputError('Difficulty must be 0, 1, 2 or 3')
+    limit = data.get('limit', 20)
+    if not isinstance(limit, int):
+        raise InputError('Limit must be int')
+    if user.role.only_has_powers(['select_song_rank_top'], ['select', 'select_song_rank']):
+        # 限制低权限只能查询前20名
+        if limit > 20 or limit < 0:
+            limit = 20
+    with Connect() as c:
+        rank_list = RankList(c)
+        rank_list.song.set_chart(song_id, difficulty)
+        rank_list.limit = limit
+        # 不检查歌曲是否存在，不存在返回的是空列表
+        rank_list.select_top()
+        return success_return(rank_list.to_dict_list())

latest version/api/system.py

@@ -0,0 +1,32 @@
+from flask import Blueprint, request
+
+from core.error import ArcError
+from core.operation import BaseOperation
+
+from .api_auth import api_try, role_required
+from .api_code import success_return
+
+bp = Blueprint('system', __name__, url_prefix='/system')
+
+
+operation_dict = {i._name: i for i in BaseOperation.__subclasses__()}
+
+
+@bp.route('/operations', methods=['GET'])
+@role_required(request, ['system'])
+@api_try
+def operations_get(user):
+    return success_return(list(operation_dict.keys()))
+
+
+@bp.route('/operations/<string:operation_name>', methods=['POST'])
+@role_required(request, ['system'])
+@api_try
+def operations_operation_post(user, operation_name: str):
+    if operation_name not in operation_dict:
+        raise ArcError(
+            f'No such operation: `{operation_name}`', api_error_code=-1, status=404)
+    x = operation_dict[operation_name]()
+    x.set_params(**request.get_json())
+    x.run()
+    return success_return()

latest version/api/token.py

@@ -1,9 +1,10 @@
 from base64 import b64decode
 
+from flask import Blueprint, request
+
 from core.api_user import APIUser
 from core.error import PostError
 from core.sql import Connect
-from flask import Blueprint, request
 
 from .api_auth import api_try, request_json_handle, role_required
 from .api_code import success_return
@@ -16,21 +17,22 @@ bp = Blueprint('token', __name__, url_prefix='/token')
 @api_try
 def token_post(data):
     '''
-        登录，获取token\ 
+        登录，获取token
+
         {'auth': base64('<user_id>:<password>')}
     '''
     try:
         auth_decode = bytes.decode(b64decode(data['auth']))
-    except:
+    except Exception as e:
-        raise PostError(api_error_code=-100)
+        raise PostError(api_error_code=-100) from e
-    if not ':' in auth_decode:
+    if ':' not in auth_decode:
         raise PostError(api_error_code=-100)
     name, password = auth_decode.split(':', 1)
 
     with Connect() as c:
         user = APIUser(c)
         user.login(name, password, request.remote_addr)
-        return success_return({'token': user.token, 'user_id': user.user_id})
+        return success_return({'token': user.api_token, 'user_id': user.user_id})
 
 
 @bp.route('', methods=['GET'])

latest version/api/users.py

@@ -1,9 +1,10 @@
+from flask import Blueprint, request
+
+from core.api_user import APIUser
 from core.error import InputError, NoAccess, NoData
 from core.score import Potential, UserScoreList
 from core.sql import Connect, Query, Sql
 from core.user import UserChanger, UserInfo, UserRegister
-from core.api_user import APIUser
-from flask import Blueprint, request
 
 from .api_auth import api_try, request_json_handle, role_required
 from .api_code import error_return, success_return
@@ -78,7 +79,7 @@ def users_user_get(user, user_id):
 
 @bp.route('/<int:user_id>', methods=['PUT'])
 @role_required(request, ['change'])
-@request_json_handle(request, optional_keys=['name', 'password', 'user_code', 'ticket', 'email'])
+@request_json_handle(request, optional_keys=['name', 'password', 'user_code', 'ticket', 'email'], must_change=True)
 @api_try
 def users_user_put(data, user, user_id):
     '''修改一个用户'''
@@ -103,7 +104,6 @@ def users_user_put(data, user, user_id):
                 raise InputError('Ticket must be int')
             u.ticket = data['ticket']
             r['ticket'] = u.ticket
-        if r:
         u.update_columns(d=r)
         return success_return(r)
 
@@ -128,7 +128,7 @@ def users_user_b30_get(user, user_id):
                 f'No best30 data of user `{user_id}`', api_error_code=-3)
         x.select_song_name()
         r = x.to_dict_list()
-        rating_sum = sum([i.rating for i in x.scores])
+        rating_sum = sum(i.rating for i in x.scores)
         return success_return({'user_id': user_id, 'b30_ptt': rating_sum / 30, 'data': r})
 
 

latest version/core/api_user.py

@@ -34,6 +34,19 @@ class Role:
         '''判断role是否有power'''
         return any(power_id == i.power_id for i in self.powers)
 
+    def only_has_powers(self, power_ids: list, anti_power_ids: list = None) -> bool:
+        '''判断role是否全有power_ids里的power，且没有anti_power_ids里的任何一个power'''
+        flags = [False] * len(power_ids)
+        if anti_power_ids is None:
+            anti_power_ids = []
+        for i in self.powers:
+            if i.power_id in anti_power_ids:
+                return False
+            for j, k in enumerate(power_ids):
+                if i.power_id == k:
+                    flags[j] = True
+        return all(flags)
+
     def select_from_id(self, role_id: int = None) -> 'Role':
         '''用role_id查询role'''
         if role_id is not None:
@@ -42,8 +55,8 @@ class Role:
                        {'a': self.role_id})
         x = self.c.fetchone()
         if x is None:
-            raise NoData('The role `%s` does not exist.' %
+            raise NoData(
-                         self.role_id, api_error_code=-200)
+                f'The role `{self.role_id}` does not exist.', api_error_code=-200)
         self.caption = x[0]
         return self
 
@@ -120,18 +133,19 @@ class APIUser(UserOnline):
                        'a': self.name})
         x = self.c.fetchone()
         if x is None:
-            raise NoData('The user `%s` does not exist.' %
+            raise NoData(
-                         self.name, api_error_code=-201)
+                f'The user `{self.name}` does not exist.', api_error_code=-201, status=401)
         if x[1] == '':
-            raise UserBan('The user `%s` is banned.' % self.name)
+            raise UserBan(f'The user `{self.name}` is banned.')
         if self.hash_pwd != x[1]:
-            raise NoAccess('The password is incorrect.', api_error_code=-201)
+            raise NoAccess('The password is incorrect.',
+                           api_error_code=-201, status=401)
 
         self.user_id = x[0]
         now = int(time() * 1000)
-        self.token = sha256(
+        self.api_token = sha256(
             (str(self.user_id) + str(now)).encode("utf8") + urandom(8)).hexdigest()
 
         self.logout()
         self.c.execute('''insert into api_login values(?,?,?,?)''',
-                       (self.user_id, self.token, now, self.ip))
+                       (self.user_id, self.api_token, now, self.ip))

latest version/core/character.py

@@ -1,7 +1,7 @@
 from .config_manager import Config
 from .constant import Constant
 from .error import ArcError, InputError, ItemNotEnough, NoData
-from .item import Item, ItemCore
+from .item import CollectionItemMixin, ItemCore
 
 
 class Level:
@@ -9,9 +9,9 @@ class Level:
     min_level = 1
 
     def __init__(self) -> None:
-        self.max_level = None
+        self.max_level: int = None
-        self.level = None
+        self.level: int = None
-        self.exp = None
+        self.exp: float = None
 
     @property
     def level_exp(self):
@@ -29,9 +29,9 @@ class Level:
 
         a = []
         b = []
-        for i in Constant.LEVEL_STEPS:
+        for k, v in Constant.LEVEL_STEPS.items():
-            a.append(i)
+            a.append(k)
-            b.append(Constant.LEVEL_STEPS[i])
+            b.append(v)
 
         if exp < b[0]:  # 向下溢出，是异常状态，不该被try捕获，不然数据库无法回滚
             raise ValueError('EXP value error.')
@@ -46,23 +46,10 @@ class Level:
 
 class Skill:
     def __init__(self) -> None:
-        self.skill_id = None
+        self.skill_id: str = None
-        self.skill_id_uncap = None
+        self.skill_id_uncap: str = None
-        self.skill_unlock_level = None
+        self.skill_unlock_level: int = None
-        self.skill_requires_uncap = None
+        self.skill_requires_uncap: bool = None
-
-
-class Core(Item):
-    item_type = 'core'
-
-    def __init__(self, core_type: str = '', amount: int = 0) -> None:
-        super().__init__()
-        self.item_id = core_type
-        self.amount = amount
-        self.is_available = True
-
-    def to_dict(self):
-        return {'core_type': self.item_id, 'amount': self.amount}
 
 
 class CharacterValue:
@@ -70,16 +57,23 @@ class CharacterValue:
         self.set_parameter(start, mid, end)
 
     @staticmethod
-    def _calc_char_value_20(level, stata, statb, lva=1, lvb=20):
+    def _calc_char_value_20_math(level: int, value_1: float, value_20: float) -> float:
-        # 计算1~20级搭档数值的核心函数，返回浮点数，来自https://redive.estertion.win/arcaea/calc/
+        # by Lost-MSth
-        n = [0, 0, 0.0005831753900000081, 0.004665403120000065, 0.015745735529959858, 0.03732322495992008, 0.07289692374980007, 0.12596588423968, 0.2000291587694801, 0.29858579967923987, 0.42513485930893946,
+        # 4/6859 = 0.00058317539
-             0.5748651406910605, 0.7014142003207574, 0.7999708412305152, 0.8740341157603029, 0.9271030762501818, 0.962676775040091, 0.9842542644700301, 0.9953345968799998, 0.9994168246100001, 1]
+        if level <= 10:
-        e = n[lva] - n[lvb]
+            return 0.00058317539 * (level - 1) ** 3 * (value_20 - value_1) + value_1
-        a = stata - statb
+        return - 0.00058317539 * (20 - level) ** 3 * (value_20 - value_1) + value_20
-        r = a / e
-        d = stata - n[lva] * r
 
-        return d + r * n[level]
+    # @staticmethod
+    # def _calc_char_value_20(level: int, stata, statb, lva=1, lvb=20) -> float:
+    #     # 计算1~20级搭档数值的核心函数，返回浮点数，来自https://redive.estertion.win/arcaea/calc/
+    #     n = [0, 0, 0.0005831753900000081, 0.004665403120000065, 0.015745735529959858, 0.03732322495992008, 0.07289692374980007, 0.12596588423968, 0.2000291587694801, 0.29858579967923987, 0.42513485930893946,
+    #          0.5748651406910605, 0.7014142003207574, 0.7999708412305152, 0.8740341157603029, 0.9271030762501818, 0.962676775040091, 0.9842542644700301, 0.9953345968799998, 0.9994168246100001, 1]
+    #     e = n[lva] - n[lvb]
+    #     a = stata - statb
+    #     r = a / e
+    #     d = stata - n[lva] * r
+    #     return d + r * n[level]
 
     @staticmethod
     def _calc_char_value_30(level, stata, statb, lva=20, lvb=30):
@@ -87,42 +81,51 @@ class CharacterValue:
         return (level - lva) * (statb - stata) / (lvb - lva) + stata
 
     def set_parameter(self, start: float = 0, mid: float = 0, end: float = 0):
-        self.start = start
+        self.start: float = start
-        self.mid = mid
+        self.mid: float = mid
-        self.end = end
+        self.end: float = end
 
     def get_value(self, level: Level):
         if level.min_level <= level.level <= level.mid_level:
-            return self._calc_char_value_20(level.level, self.start, self.mid)
+            return self._calc_char_value_20_math(level.level, self.start, self.mid)
-        elif level.mid_level < level.level <= level.max_level:
+        if level.mid_level < level.level <= level.max_level:
             return self._calc_char_value_30(level.level, self.mid, self.end)
-        else:
         return 0
 
 
-class Character:
+class Character(CollectionItemMixin):
     database_table_name = None
 
-    def __init__(self) -> None:
+    collection_item_const = {
-        self.character_id = None
+        'name': 'character',
-        self.name = None
+        'table_name': 'char_item',
-        self.char_type = None
+        'table_primary_key': 'character_id',
-        self.is_uncapped = None
+        'id_name': 'character_id',
-        self.is_uncapped_override = None
+        'items_name': 'uncap_cores'
+    }
+
+    def __init__(self, c=None) -> None:
+        self.c = c
+
+        self.character_id: int = None
+        self.name: str = None
+        self.char_type: int = None
+        self.is_uncapped: bool = None
+        self.is_uncapped_override: bool = None
         self.skill = Skill()
         self.level = Level()
         self.frag = CharacterValue()
         self.prog = CharacterValue()
         self.overdrive = CharacterValue()
-        self.uncap_cores = []
+        self.uncap_cores: list = []
-        self.voice = None
+        self.voice: list = None
 
     @property
     def skill_id_displayed(self) -> str:
         return None
 
     def uncap_cores_to_dict(self):
-        return [x.to_dict() for x in self.uncap_cores]
+        return [x.to_dict(character_format=True) for x in self.uncap_cores]
 
     @property
     def is_uncapped_displayed(self) -> bool:
@@ -134,10 +137,76 @@ class Character:
         # 应该是只有对立这样
         return self.character_id == 1
 
+    def to_dict(self, has_cores=False) -> dict:
+        # 用于API里，游戏内的数据不太一样，故不能super
+        r = {
+            'character_id': self.character_id,
+            'name': self.name,
+            'char_type': self.char_type,
+            'is_uncapped': self.is_uncapped,
+            'max_level': self.level.max_level,
+            'skill_id': self.skill.skill_id,
+            'skill_unlock_level': self.skill.skill_unlock_level,
+            'skill_requires_uncap': self.skill.skill_requires_uncap,
+            'skill_id_uncap': self.skill.skill_id_uncap,
+            'frag1': self.frag.start,
+            'frag20': self.frag.mid,
+            'frag30': self.frag.end,
+            'prog1': self.prog.start,
+            'prog20': self.prog.mid,
+            'prog30': self.prog.end,
+            'overdrive1': self.overdrive.start,
+            'overdrive20': self.overdrive.mid,
+            'overdrive30': self.overdrive.end,
+        }
+        if has_cores:
+            r['uncap_cores'] = self.uncap_cores_to_dict()
+        return r
+
+    def from_list(self, l: tuple) -> 'Character':
+        self.character_id = l[0]
+        self.name = l[1]
+        self.level.max_level = l[2]
+        self.frag.set_parameter(l[3], l[6], l[9])
+        self.prog.set_parameter(l[4], l[7], l[10])
+        self.overdrive.set_parameter(l[5], l[8], l[11])
+        self.skill.skill_id = l[12]
+        self.skill.skill_unlock_level = l[13]
+        self.skill.skill_requires_uncap = l[14] == 1
+        self.skill.skill_id_uncap = l[15]
+        self.char_type = l[16]
+        self.is_uncapped = l[17] == 1
+        return self
+
+    def select(self, character_id: int = None) -> 'Character':
+        if character_id is not None:
+            self.character_id = character_id
+        self.c.execute(
+            'select * from character where character_id = ?', (self.character_id,))
+        x = self.c.fetchone()
+        if not x:
+            raise NoData(
+                f'No such character: {self.character_id}', api_error_code=-130)
+        return self.from_list(x)
+
+    def update(self) -> None:
+        self.c.execute('''update character set name = ?, max_level = ?, frag1 = ?, frag20 = ?, frag30 = ?, prog1 = ?, prog20 = ?, prog30 = ?, overdrive1 = ?, overdrive20 = ?, overdrive30 = ?, skill_id = ?, skill_unlock_level = ?, skill_requires_uncap = ?, skill_id_uncap = ?, char_type = ?, is_uncapped = ? where character_id = ?''', (
+            self.name, self.level.max_level, self.frag.start, self.frag.mid, self.frag.end, self.prog.start, self.prog.mid, self.prog.end, self.overdrive.start, self.overdrive.mid, self.overdrive.end, self.skill.skill_id, self.skill.skill_unlock_level, self.skill.skill_requires_uncap, self.skill.skill_id_uncap, self.char_type, self.is_uncapped, self.character_id))
+
+    def select_character_core(self):
+        # 获取此角色所需核心
+        self.c.execute(
+            '''select item_id, amount from char_item where character_id = ? and type="core"''', (self.character_id,))
+        x = self.c.fetchall()
+        if x:
+            self.uncap_cores = []
+            for i in x:
+                self.uncap_cores.append(ItemCore(self.c, i[0], i[1]))
+
 
 class UserCharacter(Character):
     '''
-        用户角色类\ 
+        用户角色类
         property: `user` - `User`类或子类的实例
     '''
     database_table_name = 'user_char_full' if Config.CHARACTER_FULL_UNLOCK else 'user_char'
@@ -153,27 +222,16 @@ class UserCharacter(Character):
         '''对外显示的技能id'''
         if self.is_uncapped_displayed and self.skill.skill_id_uncap:
             return self.skill.skill_id_uncap
-        elif self.skill.skill_id and self.level.level >= self.skill.skill_unlock_level:
+        if self.skill.skill_id and self.level.level >= self.skill.skill_unlock_level:
             return self.skill.skill_id
-        else:
         return None
 
-    def select_character_core(self):
-        # 获取此角色所需核心
-        self.c.execute(
-            '''select item_id, amount from char_item where character_id = ? and type="core"''', (self.character_id,))
-        x = self.c.fetchall()
-        if x:
-            self.uncap_cores = []
-            for i in x:
-                self.uncap_cores.append(Core(i[0], i[1]))
-
     def select_character_uncap_condition(self, user=None):
         # parameter: user - User类或子类的实例
         # 获取此角色的觉醒信息
         if user:
             self.user = user
-        self.c.execute('''select is_uncapped, is_uncapped_override from %s where user_id = :a and character_id = :b''' % self.database_table_name,
+        self.c.execute(f'''select is_uncapped, is_uncapped_override from {self.database_table_name} where user_id = :a and character_id = :b''',
                        {'a': self.user.user_id, 'b': self.character_id})
 
         x = self.c.fetchone()
@@ -190,7 +248,7 @@ class UserCharacter(Character):
         # 获取所给用户此角色信息
         if user:
             self.user = user
-        self.c.execute('''select * from %s a,character b where a.user_id=? and a.character_id=b.character_id and a.character_id=?''' % self.database_table_name,
+        self.c.execute(f'''select * from {self.database_table_name} a,character b where a.user_id=? and a.character_id=b.character_id and a.character_id=?''',
                        (self.user.user_id, self.character_id))
 
         y = self.c.fetchone()
@@ -212,7 +270,7 @@ class UserCharacter(Character):
         self.skill.skill_unlock_level = y[19]
         self.skill.skill_requires_uncap = y[20] == 1
 
-        if self.character_id == 21 or self.character_id == 46:
+        if self.character_id in (21, 46):
             self.voice = [0, 1, 2, 3, 100, 1000, 1001]
 
         self.select_character_core()
@@ -251,7 +309,7 @@ class UserCharacter(Character):
         # 切换觉醒状态
         if user:
             self.user = user
-        self.c.execute('''select is_uncapped, is_uncapped_override from %s where user_id = :a and character_id = :b''' % self.database_table_name,
+        self.c.execute(f'''select is_uncapped, is_uncapped_override from {self.database_table_name} where user_id = :a and character_id = :b''',
                        {'a': self.user.user_id, 'b': self.character_id})
 
         x = self.c.fetchone()
@@ -261,7 +319,7 @@ class UserCharacter(Character):
         self.c.execute('''update user set is_char_uncapped_override = :a where user_id = :b''', {
             'a': 1 if x[1] == 0 else 0, 'b': self.user.user_id})
 
-        self.c.execute('''update %s set is_uncapped_override = :a where user_id = :b and character_id = :c''' % self.database_table_name, {
+        self.c.execute(f'''update {self.database_table_name} set is_uncapped_override = :a where user_id = :b and character_id = :c''', {
             'a': 1 if x[1] == 0 else 0, 'b': self.user.user_id, 'c': self.character_id})
 
         self.is_uncapped_override = x[1] == 0
@@ -295,7 +353,7 @@ class UserCharacter(Character):
                 raise ItemNotEnough('The cores are not enough.')
 
         for i in self.uncap_cores:
-            ItemCore(self.c, i, reverse=True).user_claim_item(self.user)
+            i.user_claim_item(self.user, reverse=True)
 
         self.c.execute('''update user_char set is_uncapped=1, is_uncapped_override=0 where user_id=? and character_id=?''',
                        (self.user.user_id, self.character_id))
@@ -332,8 +390,9 @@ class UserCharacter(Character):
 
     def upgrade_by_core(self, user=None, core=None):
         '''
-            以太之滴升级，注意这里core.amount应该是负数\ 
+            以太之滴升级，注意这里core.amount应该是负数
-            parameter: `user` - `User`类或子类的实例\ 
+
+            parameter: `user` - `User`类或子类的实例
                 `core` - `ItemCore`类或子类的实例
         '''
         if user:
@@ -353,7 +412,7 @@ class UserCharacter(Character):
 
 class UserCharacterList:
     '''
-        用户拥有角色列表类\ 
+        用户拥有角色列表类
         properties: `user` - `User`类或子类的实例
     '''
     database_table_name = 'user_char_full' if Config.CHARACTER_FULL_UNLOCK else 'user_char'
@@ -365,7 +424,7 @@ class UserCharacterList:
 
     def select_user_characters(self):
         self.c.execute(
-            '''select character_id from %s where user_id=?''' % self.database_table_name, (self.user.user_id,))
+            f'''select character_id from {self.database_table_name} where user_id=?''', (self.user.user_id,))
         x = self.c.fetchall()
         self.characters: list = []
         if x:

latest version/core/config_manager.py

@@ -10,7 +10,9 @@ class Config:
     USE_PROXY_FIX = False
     USE_CORS = False
 
-    GAME_API_PREFIX = '/join/21'
+    SONG_FILE_HASH_PRE_CALCULATE = True
+
+    GAME_API_PREFIX = '/pollen/22'
 
     ALLOW_APPVERSION = []  # list[str]
 
@@ -50,6 +52,8 @@ class Config:
     ALLOW_LOGIN_SAME_DEVICE = False
     ALLOW_BAN_MULTIDEVICE_USER_AUTO = True
 
+    ALLOW_SCORE_WITH_NO_SONG = True
+
     ALLOW_INFO_LOG = False
     ALLOW_WARNING_LOG = False
 
@@ -77,6 +81,7 @@ class Config:
     SQLITE_DATABASE_PATH = './database/arcaea_database.db'
     SQLITE_DATABASE_BACKUP_FOLDER_PATH = './database/backup/'
     DATABASE_INIT_PATH = './database/init/'
+    SQLITE_LOG_DATABASE_PATH = './database/arcaea_log.db'
 
     GAME_LOGIN_RATE_LIMIT = '30/5 minutes'
     API_LOGIN_RATE_LIMIT = '10/5 minutes'

latest version/core/constant.py

@@ -1,6 +1,6 @@
 from .config_manager import Config
 
-ARCAEA_SERVER_VERSION = 'v2.10.1'
+ARCAEA_SERVER_VERSION = 'v2.11.1'
 
 
 class Constant:
@@ -22,6 +22,8 @@ class Constant:
     LUNA_UNCAP_BONUS_PROGRESS = 7
     AYU_UNCAP_BONUS_PROGRESS = 5
     SKILL_FATALIS_WORLD_LOCKED_TIME = 3600000
+    SKILL_MIKA_SONGS = ['aprilshowers', 'seventhsense', 'oshamascramble',
+                        'amazingmightyyyy', 'cycles', 'maxrage', 'infinity', 'temptation']
 
     MAX_FRIEND_COUNT = Config.MAX_FRIEND_COUNT
 
@@ -35,6 +37,7 @@ class Constant:
     SONG_FILE_FOLDER_PATH = Config.SONG_FILE_FOLDER_PATH
     SONGLIST_FILE_PATH = Config.SONGLIST_FILE_PATH
     SQLITE_DATABASE_PATH = Config.SQLITE_DATABASE_PATH
+    SQLITE_LOG_DATABASE_PATH = Config.SQLITE_LOG_DATABASE_PATH
 
     DOWNLOAD_TIMES_LIMIT = Config.DOWNLOAD_TIMES_LIMIT
     DOWNLOAD_TIME_GAP_LIMIT = Config.DOWNLOAD_TIME_GAP_LIMIT

latest version/core/course.py

@@ -96,7 +96,7 @@ class Course:
             '''select * from course where course_id = ?''', (self.course_id,))
         x = self.c.fetchone()
         if x is None:
-            raise NoData('The course `%s` is not found.' % self.course_id)
+            raise NoData(f'The course `{self.course_id}` is not found.')
         return self.from_list(x)
 
     def select_course_chart(self) -> None:
@@ -151,7 +151,8 @@ class Course:
 
 class UserCourse(Course):
     '''
-        用户课题类\ 
+        用户课题类
+
         parameter: `user` - `User`类或子类的实例
     '''
 
@@ -200,7 +201,8 @@ class UserCourse(Course):
 
 class UserCourseList:
     '''
-        用户课题列表类\ 
+        用户课题列表类
+
         parameter: `user` - `User`类或子类的实例
     '''
 
@@ -237,8 +239,9 @@ class UserCourseList:
 
 class CoursePlay(UserCourse):
     '''
-        课题模式打歌类，联动UserPlay\ 
+        课题模式打歌类，联动UserPlay
-        parameter: `user` - `UserOnline`类或子类的实例\ 
+
+        parameter: `user` - `UserOnline`类或子类的实例
         'user_play` - `UserPlay`类的实例
     '''
 

latest version/core/download.py

@@ -5,6 +5,7 @@ from time import time
 
 from flask import url_for
 
+from .config_manager import Config
 from .constant import Constant
 from .error import NoAccess
 from .limiter import ArcLimiter
@@ -20,15 +21,6 @@ def get_song_file_md5(song_id: str, file_name: str) -> str:
     return get_file_md5(path)
 
 
-def initialize_songfile():
-    '''初始化歌曲数据的md5信息'''
-    get_song_file_md5.cache_clear()
-    x = DownloadList()
-    x.url_flag = False
-    x.add_songs()
-    del x
-
-
 class SonglistParser:
     '''songlist文件解析器'''
 
@@ -51,7 +43,7 @@ class SonglistParser:
         self.parse()
 
     @staticmethod
-    def is_available_file(song_id: str, file_name: str) -> list:
+    def is_available_file(song_id: str, file_name: str) -> bool:
         '''判断文件是否允许被下载'''
         if song_id not in SonglistParser.songs:
             # songlist没有，则只限制文件名
@@ -96,7 +88,8 @@ class SonglistParser:
 
 class UserDownload:
     '''
-        用户下载类\ 
+        用户下载类
+
         properties: `user` - `User`类或子类的实例
     '''
 
@@ -166,7 +159,6 @@ class UserDownload:
             if prefix[-1] != '/':
                 prefix += '/'
             return f'{prefix}{self.song_id}/{self.file_name}?t={self.token}'
-        else:
         return url_for('download', file_path=f'{self.song_id}/{self.file_name}', t=self.token, _external=True)
 
     @property
@@ -176,7 +168,7 @@ class UserDownload:
 
 class DownloadList(UserDownload):
     '''
-        下载列表类\ 
+        下载列表类
         properties: `user` - `User`类或子类的实例
     '''
 
@@ -189,13 +181,23 @@ class DownloadList(UserDownload):
         self.downloads: list = []
         self.urls: dict = {}
 
+    @classmethod
+    def initialize_cache(cls) -> None:
+        '''初始化歌曲数据缓存，包括md5、文件目录遍历、解析songlist'''
+        SonglistParser()
+        if Config.SONG_FILE_HASH_PRE_CALCULATE:
+            x = cls()
+            x.url_flag = False
+            x.add_songs()
+            del x
+
     @staticmethod
-    def clear_all_cache():
+    def clear_all_cache() -> None:
         '''清除所有歌曲文件有关缓存'''
         get_song_file_md5.cache_clear()
         DownloadList.get_one_song_file_names.cache_clear()
         DownloadList.get_all_song_ids.cache_clear()
-        SonglistParser()
+        SonglistParser.songs = {}
 
     def clear_download_token(self) -> None:
         '''清除过期下载链接'''
@@ -212,9 +214,10 @@ class DownloadList(UserDownload):
     def get_one_song_file_names(song_id: str) -> list:
         '''获取一个歌曲文件夹下的所有合法文件名，有lru缓存'''
         r = []
-        for i in os.listdir(os.path.join(Constant.SONG_FILE_FOLDER_PATH, song_id)):
+        for i in os.scandir(os.path.join(Constant.SONG_FILE_FOLDER_PATH, song_id)):
-            if os.path.isfile(os.path.join(Constant.SONG_FILE_FOLDER_PATH, song_id, i)) and SonglistParser.is_available_file(song_id, i):
+            file_name = i.name
-                r.append(i)
+            if i.is_file() and SonglistParser.is_available_file(song_id, file_name):
+                r.append(file_name)
         return r
 
     def add_one_song(self, song_id: str) -> None:
@@ -240,7 +243,7 @@ class DownloadList(UserDownload):
                     re['audio']['3'] = {"checksum": x.hash, "url": x.url}
                 else:
                     re['audio']['3'] = {"checksum": x.hash}
-            elif i == 'video.mp4' or i == 'video_audio.ogg':
+            elif i in ('video.mp4', 'video_audio.ogg'):
                 if 'additional_files' not in re:
                     re['additional_files'] = []
 
@@ -265,7 +268,7 @@ class DownloadList(UserDownload):
     @lru_cache()
     def get_all_song_ids() -> list:
         '''获取全歌曲文件夹列表，有lru缓存'''
-        return list(filter(lambda x: os.path.isdir(os.path.join(Constant.SONG_FILE_FOLDER_PATH, x)), os.listdir(Constant.SONG_FILE_FOLDER_PATH)))
+        return [i.name for i in os.scandir(Constant.SONG_FILE_FOLDER_PATH) if i.is_dir()]
 
     def add_songs(self, song_ids: list = None) -> None:
         '''添加一个或多个歌曲到下载列表，若`song_ids`为空，则添加所有歌曲'''

latest version/core/error.py

@@ -19,7 +19,9 @@ class InputError(ArcError):
 
 class DataExist(ArcError):
     '''数据存在'''
-    pass
+
+    def __init__(self, message=None, error_code=108, api_error_code=-4, extra_data=None, status=200) -> None:
+        super().__init__(message, error_code, api_error_code, extra_data, status)
 
 
 class NoData(ArcError):

latest version/core/init.py

@@ -4,11 +4,12 @@ from importlib import import_module
 from json import load
 from shutil import copy, copy2
 from time import time
+from traceback import format_exc
 
 from core.config_manager import Config
 from core.constant import ARCAEA_SERVER_VERSION
 from core.course import Course
-from core.download import SonglistParser
+from core.download import DownloadList
 from core.purchase import Purchase
 from core.sql import Connect, DatabaseMigrator, MemoryDatabase
 from core.user import UserRegister
@@ -40,16 +41,17 @@ class DatabaseInit:
 
     def table_init(self) -> None:
         '''初始化数据库结构'''
-        with open(self.sql_path, 'r') as f:
+        with open(self.sql_path, 'r', encoding='utf-8') as f:
             self.c.executescript(f.read())
         self.c.execute('''insert into config values("version", :a);''', {
             'a': ARCAEA_SERVER_VERSION})
 
     def character_init(self) -> None:
         '''初始化搭档信息'''
+        uncapped_characters = self.init_data.char_core.keys()
         for i in range(0, len(self.init_data.char)):
             skill_requires_uncap = 1 if i == 2 else 0
-            if i in [0, 1, 2, 4, 13, 26, 27, 28, 29, 36, 21, 42, 43, 11, 12, 19, 5]:
+            if i in uncapped_characters:
                 max_level = 30
                 uncapable = 1
             else:
@@ -90,22 +92,16 @@ class DatabaseInit:
         self.c.execute('''insert into item values(?,?,?)''',
                        ('anni5tix', 'anni5tix', 1))
 
-        with open(self.pack_path, 'r') as f:
+        with open(self.pack_path, 'rb') as f:
             self.insert_purchase_item(load(f))
 
-        with open(self.single_path, 'r') as f:
+        with open(self.single_path, 'rb') as f:
             self.insert_purchase_item(load(f))
 
-        self.c.execute(
-            '''select exists(select * from item where item_id='epilogue')''')
-        if self.c.fetchone() == (0,):
-            self.c.execute(
-                '''insert into item values('epilogue','pack',1)''')
-
     def course_init(self) -> None:
         '''初始化课题信息'''
         courses = []
-        with open(self.course_path, 'r', encoding='utf-8') as f:
+        with open(self.course_path, 'rb') as f:
             courses = load(f)
         for i in courses:
             x = Course(self.c).from_dict(i)
@@ -157,35 +153,73 @@ class DatabaseInit:
             self.admin_init()
 
 
-class FileChecker:
+class LogDatabaseInit:
+    def __init__(self, db_path: str = Config.SQLITE_LOG_DATABASE_PATH, init_folder_path: str = Config.DATABASE_INIT_PATH) -> None:
+        self.db_path = db_path
+        self.init_folder_path = init_folder_path
+        self.c = None
 
-    def __init__(self, app=None):
+    @property
-        self.app = app
+    def sql_path(self) -> str:
+        return os.path.join(self.init_folder_path, 'log_tables.sql')
+
+    def table_init(self) -> None:
+        '''初始化数据库结构'''
+        with open(self.sql_path, 'r') as f:
+            self.c.executescript(f.read())
+        self.c.execute(
+            '''insert into cache values("version", :a, -1);''', {'a': ARCAEA_SERVER_VERSION})
+
+    def init(self) -> None:
+        with Connect(self.db_path) as c:
+            self.c = c
+            self.table_init()
+
+
+class FileChecker:
+    '''文件检查及初始化类'''
+
+    def __init__(self, logger=None):
+        self.logger = logger
 
     def check_file(self, file_path: str) -> bool:
         f = os.path.isfile(file_path)
         if not f:
-            self.app.logger.warning('File `%s` is missing.' % file_path)
+            self.logger.warning('File `%s` is missing.' % file_path)
         return f
 
     def check_folder(self, folder_path: str) -> bool:
         f = os.path.isdir(folder_path)
         if not f:
-            self.app.logger.warning('Folder `%s` is missing.' % folder_path)
+            self.logger.warning('Folder `%s` is missing.' % folder_path)
         return f
 
     def check_update_database(self) -> bool:
+        if not self.check_file(Config.SQLITE_LOG_DATABASE_PATH):
+            # 新建日志数据库
+            try:
+                self.logger.info(
+                    f'Try to new the file {Config.SQLITE_LOG_DATABASE_PATH}')
+                LogDatabaseInit().init()
+                self.logger.info(
+                    f'Success to new the file {Config.SQLITE_LOG_DATABASE_PATH}')
+            except Exception as e:
+                self.logger.error(format_exc())
+                self.logger.error(
+                    f'Failed to new the file {Config.SQLITE_LOG_DATABASE_PATH}')
+                return False
         if not self.check_file(Config.SQLITE_DATABASE_PATH):
             # 新建数据库
             try:
-                self.app.logger.info(
+                self.logger.info(
                     'Try to new the file `%s`.' % Config.SQLITE_DATABASE_PATH)
                 DatabaseInit().init()
-                self.app.logger.info(
+                self.logger.info(
                     'Success to new the file `%s`.' % Config.SQLITE_DATABASE_PATH)
-            except:
+            except Exception as e:
-                self.app.logger.warning(
+                self.logger.error(format_exc())
-                    'Fail to new the file `%s`.' % Config.SQLITE_DATABASE_PATH)
+                self.logger.warning(
+                    'Failed to new the file `%s`.' % Config.SQLITE_DATABASE_PATH)
                 return False
         else:
             # 检查更新
@@ -197,10 +231,10 @@ class FileChecker:
                     x = None
             # 数据库自动更新，不强求
             if not x or x[0] != ARCAEA_SERVER_VERSION:
-                self.app.logger.warning(
+                self.logger.warning(
                     'Maybe the file `%s` is an old version.' % Config.SQLITE_DATABASE_PATH)
                 try:
-                    self.app.logger.info(
+                    self.logger.info(
                         'Try to update the file `%s`.' % Config.SQLITE_DATABASE_PATH)
 
                     if not os.path.isdir(Config.SQLITE_DATABASE_BACKUP_FOLDER_PATH):
@@ -224,11 +258,12 @@ class FileChecker:
                     DatabaseInit().init()
                     self.update_database(temp_path)
 
-                    self.app.logger.info(
+                    self.logger.info(
                         'Success to update the file `%s`.' % Config.SQLITE_DATABASE_PATH)
 
-                except ValueError:
+                except Exception as e:
-                    self.app.logger.warning(
+                    self.logger.error(format_exc())
+                    self.logger.warning(
                         'Fail to update the file `%s`.' % Config.SQLITE_DATABASE_PATH)
 
         return True
@@ -240,9 +275,22 @@ class FileChecker:
             DatabaseMigrator(old_path, new_path).update_database()
             os.remove(old_path)
 
+    def check_song_file(self) -> bool:
+        '''检查song有关文件并初始化缓存'''
+        f = self.check_folder(Config.SONG_FILE_FOLDER_PATH)
+        self.logger.info("Start to initialize song data...")
+        try:
+            DownloadList.initialize_cache()
+            if not Config.SONG_FILE_HASH_PRE_CALCULATE:
+                self.logger.info('Song file hash pre-calculate is disabled.')
+            self.logger.info('Complete!')
+        except Exception as e:
+            self.logger.error(format_exc())
+            self.logger.warning('Initialization error!')
+            f = False
+        return f
+
     def check_before_run(self) -> bool:
         '''运行前检查，返回布尔值'''
-        # TODO: try
         MemoryDatabase()  # 初始化内存数据库
-        SonglistParser()  # 解析songlist
+        return self.check_song_file() & self.check_update_database()
-        return self.check_folder(Config.SONG_FILE_FOLDER_PATH) & self.check_update_database()

latest version/core/item.py

@@ -1,14 +1,18 @@
 from .config_manager import Config
-from .error import InputError, ItemNotEnough, ItemUnavailable, NoData
+from .error import DataExist, InputError, ItemNotEnough, ItemUnavailable, NoData
 
 
 class Item:
     item_type = None
 
-    def __init__(self) -> None:
+    def __init__(self, c=None) -> None:
         self.item_id = None
         self.__amount = None
         self.is_available = None
+        self.c = c
+
+    def __eq__(self, other: 'Item') -> bool:
+        return self.item_id == other.item_id and self.item_type == other.item_type
 
     @property
     def amount(self):
@@ -18,12 +22,13 @@ class Item:
     def amount(self, value: int):
         self.__amount = int(value)
 
-    def to_dict(self, has_is_available: bool = False) -> dict:
+    def to_dict(self, has_is_available: bool = False, has_amount: bool = True) -> dict:
         r = {
             'id': self.item_id,
-            'amount': self.amount,
             'type': self.item_type
         }
+        if has_amount:
+            r['amount'] = self.amount
         if has_is_available:
             r['is_available'] = self.is_available
         return r
@@ -32,6 +37,32 @@ class Item:
         # parameter: user - User类或子类的实例
         pass
 
+    def select_exists(self):
+        self.c.execute('''select exists(select * from item where item_id=? and type=?)''',
+                       (self.item_id, self.item_type))
+        return bool(self.c.fetchone()[0])
+
+    def insert(self, ignore: bool = False):
+        sql = '''insert into item values(?,?,?)''' if not ignore else '''insert or ignore into item values(?,?,?)'''
+        self.c.execute(sql, (self.item_id, self.item_type, self.is_available))
+
+    def delete(self):
+        self.c.execute('''delete from item where item_id=? and type=?''',
+                       (self.item_id, self.item_type))
+
+    def update(self):
+        self.c.execute('''update item set is_available=? where item_id=? and type=?''',
+                       (self.is_available, self.item_id, self.item_type))
+
+    def select(self):
+        self.c.execute('''select is_available from item where item_id=? and type=?''',
+                       (self.item_id, self.item_type))
+        x = self.c.fetchone()
+        if not x:
+            raise NoData(
+                f'No such item `{self.item_type}`: `{self.item_id}`', api_error_code=-121)
+        self.is_available = x[0]
+
 
 class UserItem(Item):
 
@@ -40,9 +71,10 @@ class UserItem(Item):
         self.c = c
         self.user = None
 
-    def select(self, user=None):
+    def select_user_item(self, user=None):
         '''
-            查询用户item\ 
+            查询用户item
+
             parameter: `user` - `User`类或子类的实例
         '''
         if user is not None:
@@ -71,7 +103,6 @@ class NormalItem(UserItem):
                 if x[0] == 0:
                     self.is_available = False
                     raise ItemUnavailable('The item is unavailable.')
-                else:
                 self.is_available = True
             else:
                 raise NoData('No item data.')
@@ -111,16 +142,29 @@ class PositiveItem(UserItem):
 class ItemCore(PositiveItem):
     item_type = 'core'
 
-    def __init__(self, c, core=None, reverse=False) -> None:
+    def __init__(self, c, core_type: str = '', amount: int = 0) -> None:
         super().__init__(c)
         self.is_available = True
-        if core:
+        self.item_id = core_type
-            self.item_id = core.item_id
+        self.amount = amount
-            self.amount = - core.amount if reverse else core.amount
 
     def __str__(self) -> str:
         return self.item_id + '_' + str(self.amount)
 
+    def to_dict(self, has_is_available: bool = False, has_amount: bool = True, character_format: bool = False) -> dict:
+        if character_format:
+            # 搭档的core是特殊格式的
+            return {'core_type': self.item_id, 'amount': self.amount}
+        return super().to_dict(has_is_available=has_is_available, has_amount=has_amount)
+
+    def user_claim_item(self, user, reverse: bool = False) -> None:
+        # 骚操作，将amount变为负数后使用再变回来
+        if reverse:
+            self.amount = -self.amount
+        super().user_claim_item(user)
+        if reverse:
+            self.amount = -self.amount
+
 
 class ItemCharacter(UserItem):
     item_type = 'character'
@@ -226,16 +270,10 @@ class CourseBanner(NormalItem):
 class Single(NormalItem):
     item_type = 'single'
 
-    def __init__(self, c) -> None:
-        super().__init__(c)
-
 
 class Pack(NormalItem):
     item_type = 'pack'
 
-    def __init__(self, c) -> None:
-        super().__init__(c)
-
 
 class ProgBoost(UserItem):
     item_type = 'prog_boost_300'
@@ -245,7 +283,8 @@ class ProgBoost(UserItem):
 
     def user_claim_item(self, user):
         '''
-            世界模式prog_boost\ 
+            世界模式prog_boost
+
             parameters: `user` - `UserOnline`类或子类的实例
         '''
         user.update_user_one_column('prog_boost', 300)
@@ -259,7 +298,7 @@ class Stamina6(UserItem):
 
     def user_claim_item(self, user):
         '''
-            世界模式记忆源点或残片买体力+6\ 
+            世界模式记忆源点或残片买体力+6
             顺手清一下世界模式过载状态
         '''
         user.select_user_about_stamina()
@@ -302,7 +341,8 @@ class ItemFactory:
         elif item_type == 'course_banner':
             return CourseBanner(self.c)
         else:
-            raise InputError('The item type `%s` is wrong.' % item_type)
+            raise InputError(
+                f'The item type `{item_type}` is invalid.', api_error_code=-120)
 
     @classmethod
     def from_dict(cls, d: dict, c=None):
@@ -354,8 +394,8 @@ class ItemFactory:
 
 class UserItemList:
     '''
-        用户的item列表\ 
+        用户的item列表
-        注意只能查在user_item里面的，character不行\ 
+        注意只能查在user_item里面的，character不行
         properties: `user` - `User`类或子类的实例
     '''
 
@@ -388,3 +428,63 @@ class UserItemList:
             self.items.append(ItemFactory.from_dict(
                 {'item_id': i[0], 'amount': amount, 'item_type': item_type}, self.c))
         return self
+
+
+class CollectionItemMixin:
+    '''
+       批量修改一些集合中的items
+    '''
+    collection_item_const = {
+        'name': 'collection',
+        'table_name': 'collection_item',
+        'table_primary_key': 'collection_id',
+        'id_name': 'collection_id',
+        'items_name': 'items'
+    }
+
+    def add_items(self, items: 'list[Item]') -> None:
+        collection_id: 'str' = getattr(
+            self, self.collection_item_const['id_name'])
+        collection_items: 'list[Item]' = getattr(
+            self, self.collection_item_const['items_name'])
+
+        for i in items:
+            if not i.select_exists():
+                raise NoData(
+                    f'No such item `{i.item_type}`: `{i.item_id}`', api_error_code=-121)
+            if i in collection_items:
+                raise DataExist(
+                    f'Item `{i.item_type}`: `{i.item_id}` already exists in {self.collection_item_const["name"]} `{collection_id}`', api_error_code=-123)
+        self.c.executemany(f'''insert into {self.collection_item_const["table_name"]} values (?, ?, ?, ?)''', [
+                           (collection_id, i.item_id, i.item_type, i.amount) for i in items])
+        collection_items.extend(items)
+
+    def remove_items(self, items: 'list[Item]') -> None:
+        collection_id: 'str' = getattr(
+            self, self.collection_item_const['id_name'])
+        collection_items: 'list[Item]' = getattr(
+            self, self.collection_item_const['items_name'])
+
+        for i in items:
+            if i not in collection_items:
+                raise NoData(
+                    f'No such item `{i.item_type}`: `{i.item_id}` in {self.collection_item_const["name"]} `{collection_id}`', api_error_code=-124)
+        self.c.executemany(f'''delete from {self.collection_item_const["table_name"]} where {self.collection_item_const["table_primary_key"]}=? and item_id=? and type=?''', [
+                           (collection_id, i.item_id, i.item_type) for i in items])
+        for i in items:
+            collection_items.remove(i)
+
+    def update_items(self, items: 'list[Item]') -> None:
+        collection_id: 'str' = getattr(
+            self, self.collection_item_const['id_name'])
+        collection_items: 'list[Item]' = getattr(
+            self, self.collection_item_const['items_name'])
+
+        for i in items:
+            if i not in collection_items:
+                raise NoData(
+                    f'No such item `{i.item_type}`: `{i.item_id}` in {self.collection_item_const["name"]} `{collection_id}`', api_error_code=-124)
+        self.c.executemany(f'''update {self.collection_item_const["table_name"]} set amount=? where {self.collection_item_const["table_primary_key"]}=? and item_id=? and type=?''', [
+                           (i.amount, collection_id, i.item_id, i.item_type) for i in items])
+        for i in items:
+            collection_items[collection_items.index(i)].amount = i.amount

latest version/core/linkplay.py

@@ -103,9 +103,9 @@ class RemoteMultiPlayer:
             sock.sendall(bytes(data + "\n", "utf-8"))
             try:
                 received = str(sock.recv(1024), "utf-8").strip()
-            except socket.timeout:
+            except socket.timeout as e:
                 raise Timeout(
-                    'Timeout when waiting for data from link play server.', status=400)
+                    'Timeout when waiting for data from link play server.', status=400) from e
             # print(received)
             return received
 
@@ -116,8 +116,8 @@ class RemoteMultiPlayer:
 
         self.data_recv = received.split('|')
         if self.data_recv[0] != '0':
-            raise ArcError('Link Play error.',
+            code = int(self.data_recv[0])
-                           int(self.data_recv[0]), status=400)
+            raise ArcError(f'Link Play error code: {code}', code, status=400)
 
     def create_room(self, user: 'Player' = None) -> None:
         '''创建房间'''

latest version/core/operation.py

@@ -0,0 +1,247 @@
+from .download import DownloadList
+from .error import NoData
+from .save import SaveData
+from .score import Score
+from .sql import Connect, Sql
+from .user import User
+
+
+class BaseOperation:
+    _name: str = None
+
+    def __init__(self, *args, **kwargs):
+        pass
+
+    def __call__(self, *args, **kwargs) -> None:
+        return self.run(*args, **kwargs)
+
+    def set_params(self, *args, **kwargs) -> None:
+        pass
+
+    def run(self, *args, **kwargs) -> None:
+        raise NotImplementedError
+
+
+class RefreshAllScoreRating(BaseOperation):
+    '''
+        刷新所有成绩的评分
+    '''
+    _name = 'refresh_all_score_rating'
+
+    def run(self):
+        # 追求效率，不用Song类，尽量不用对象
+        # 但其实还是很慢
+        with Connect() as c:
+            c.execute(
+                '''select song_id, rating_pst, rating_prs, rating_ftr, rating_byn from chart''')
+            x = c.fetchall()
+
+            songs = [i[0] for i in x]
+            c.execute(
+                f'''update best_score set rating=0 where song_id not in ({','.join(['?']*len(songs))})''', songs)
+
+            for i in x:
+                for j in range(0, 4):
+                    defnum = -10  # 没在库里的全部当做定数-10
+                    if i[j+1] is not None and i[j+1] > 0:
+                        defnum = float(i[j+1]) / 10
+
+                    c.execute('''select user_id, score from best_score where song_id=:a and difficulty=:b''', {
+                              'a': i[0], 'b': j})
+                    y = c.fetchall()
+                    values = []
+                    where_values = []
+                    for k in y:
+                        ptt = Score.calculate_rating(defnum, k[1])
+                        ptt = max(ptt, 0)
+                        values.append((ptt,))
+                        where_values.append((k[0], i[0], j))
+                    if values:
+                        Sql(c).update_many('best_score', ['rating'], values, [
+                            'user_id', 'song_id', 'difficulty'], where_values)
+
+
+class RefreshSongFileCache(BaseOperation):
+    '''
+        刷新歌曲文件缓存，包括文件hash缓存重建、文件目录重遍历、songlist重解析
+        注意在设置里预先计算关闭的情况下，文件hash不会计算
+    '''
+    _name = 'refresh_song_file_cache'
+
+    def run(self):
+        DownloadList.clear_all_cache()
+        DownloadList.initialize_cache()
+
+
+class SaveUpdateScore(BaseOperation):
+    '''
+        云存档更新成绩，是覆盖式更新
+        提供user参数时，只更新该用户的成绩，否则更新所有用户的成绩
+    '''
+    _name = 'save_update_score'
+
+    def __init__(self, user=None):
+        self.user = user
+
+    def set_params(self, user_id: int = None, *args, **kwargs):
+        if user_id is not None:
+            self.user = User()
+            self.user.user_id = int(user_id)
+
+    def run(self, user=None):
+        '''
+        parameter:
+            `user` - `User`类或子类的实例
+        '''
+        if user is not None:
+            self.user = user
+        if self.user is not None and self.user.user_id is not None:
+            self._one_user_update()
+        else:
+            self._all_update()
+
+    def _one_user_update(self):
+        with Connect() as c:
+            save = SaveData(c)
+            save.select_scores(self.user)
+
+            clear_state = {f'{i["song_id"]}{i["difficulty"]}': i['clear_type']
+                           for i in save.clearlamps_data}
+
+            song_id_1 = [i['song_id'] for i in save.scores_data]
+            song_id_2 = [i['song_id'] for i in save.clearlamps_data]
+            song_id = list(set(song_id_1 + song_id_2))
+
+            c.execute(
+                f'''select song_id, rating_pst, rating_prs, rating_ftr, rating_byn from chart where song_id in ({','.join(['?']*len(song_id))})''', song_id)
+            x = c.fetchall()
+            song_chart_const = {i[0]: [i[1], i[2], i[3], i[4]]
+                                for i in x}  # chart const * 10
+
+            new_scores = []
+            for i in save.scores_data:
+                rating = 0
+                if i['song_id'] in song_chart_const:
+                    rating = Score.calculate_rating(
+                        song_chart_const[i['song_id']][i['difficulty']] / 10, i['score'])
+                    rating = max(rating, 0)
+
+                y = f'{i["song_id"]}{i["difficulty"]}'
+                if y in clear_state:
+                    clear_type = clear_state[y]
+                else:
+                    clear_type = 0
+
+                new_scores.append((self.user.user_id, i['song_id'], i['difficulty'], i['score'], i['shiny_perfect_count'], i['perfect_count'],
+                                   i['near_count'], i['miss_count'], i['health'], i['modifier'], i['time_played'], clear_type, clear_type, rating))
+
+            c.executemany(
+                '''insert or replace into best_score values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)''', new_scores)
+
+    def _all_update(self):
+        with Connect() as c:
+            c.execute(
+                '''select song_id, rating_pst, rating_prs, rating_ftr, rating_byn from chart''')
+            song_chart_const = {i[0]: [i[1], i[2], i[3], i[4]]
+                                for i in c.fetchall()}  # chart const * 10
+            c.execute('''select user_id from user_save''')
+            for y in c.fetchall():
+                user = User()
+                user.user_id = y[0]
+                save = SaveData(c)
+                save.select_scores(user)
+
+                clear_state = {f'{i["song_id"]}{i["difficulty"]}': i['clear_type']
+                               for i in save.clearlamps_data}
+
+                new_scores = []
+                for i in save.scores_data:
+                    rating = 0
+                    if i['song_id'] in song_chart_const:
+                        rating = Score.calculate_rating(
+                            song_chart_const[i['song_id']][i['difficulty']] / 10, i['score'])
+                        rating = max(rating, 0)
+
+                    y = f'{i["song_id"]}{i["difficulty"]}'
+                    if y in clear_state:
+                        clear_type = clear_state[y]
+                    else:
+                        clear_type = 0
+
+                    new_scores.append((user.user_id, i['song_id'], i['difficulty'], i['score'], i['shiny_perfect_count'], i['perfect_count'],
+                                       i['near_count'], i['miss_count'], i['health'], i['modifier'], i['time_played'], clear_type, clear_type, rating))
+
+                c.executemany(
+                    '''insert or replace into best_score values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)''', new_scores)
+
+
+class UnlockUserItem(BaseOperation):
+    '''
+        全解锁/锁定用户物品
+        提供user参数时，只更新该用户的，否则更新所有用户的
+    '''
+    _name = 'unlock_user_item'
+
+    ALLOW_TYPES = ['single', 'pack', 'world_song',
+                   'course_banner', 'world_unlock']
+
+    def __init__(self, user=None, method: str = 'unlock', item_types: list = ['single', 'pack']):
+        self.user = user
+        self.set_params(method=method, item_types=item_types)
+
+    def set_params(self, user_id: int = None, method: str = 'unlock', item_types: list = ['single', 'pack'], *args, **kwargs):
+        if user_id is not None:
+            self.user = User()
+            self.user.user_id = int(user_id)
+        if method in ['unlock', 'lock']:
+            self.method = method
+        if isinstance(item_types, list) and all(i in self.ALLOW_TYPES for i in item_types):
+            self.item_types = item_types
+
+    def run(self):
+        if self.user is not None and self.user.user_id is not None:
+            if self.method == 'unlock':
+                self._one_user_insert()
+            else:
+                self._one_user_delete()
+        else:
+            if self.method == 'unlock':
+                self._all_insert()
+            else:
+                self._all_delete()
+
+    def _one_user_insert(self):
+        with Connect() as c:
+            c.execute(
+                '''select exists(select * from user where user_id = ?)''', (self.user.user_id,))
+            if not c.fetchone()[0]:
+                raise NoData(
+                    f'No such user: `{self.user.user_id}`', api_error_code=-110)
+            c.execute(
+                f'''select item_id, type from item where type in ({','.join(['?'] * len(self.item_types))})''', self.item_types)
+            sql_list = [(self.user.user_id, i[0], i[1])
+                        for i in c.fetchall()]
+            c.executemany(
+                '''insert or ignore into user_item values (?, ?, ?, 1)''', sql_list)
+
+    def _all_insert(self):
+        with Connect() as c:
+            c.execute('''select user_id from user''')
+            x = c.fetchall()
+            c.execute(
+                f'''select item_id, type from item where type in ({','.join(['?'] * len(self.item_types))})''', self.item_types)
+            y = c.fetchall()
+            sql_list = [(i[0], j[0], j[1])
+                        for i in x for j in y]
+            c.executemany(
+                '''insert or ignore into user_item values (?, ?, ?, 1)''', sql_list)
+
+    def _one_user_delete(self):
+        with Connect() as c:
+            c.execute(
+                f'''delete from user_item where user_id = ? and type in ({','.join(['?'] * len(self.item_types))})''', (self.user.user_id, *self.item_types))
+
+    def _all_delete(self):
+        with Connect() as c:
+            c.execute(
+                f'''delete from user_item where type in ({','.join(['?'] * len(self.item_types))})''', self.item_types)

latest version/core/present.py

@@ -1,11 +1,18 @@
 from time import time
 
-from core.item import ItemFactory
-
 from .error import ArcError, NoData
+from .item import CollectionItemMixin, ItemFactory
 
 
-class Present:
+class Present(CollectionItemMixin):
+    collection_item_const = {
+        'name': 'present',
+        'table_name': 'present_item',
+        'table_primary_key': 'present_id',
+        'id_name': 'present_id',
+        'items_name': 'items'
+    }
+
     def __init__(self, c=None) -> None:
         self.c = c
         self.present_id: str = None
@@ -18,15 +25,39 @@ class Present:
     def is_expired(self) -> bool:
         return self.expire_ts < int(time() * 1000)
 
-    def to_dict(self) -> dict:
+    def to_dict(self, has_items: bool = True) -> dict:
-        return {
+        r = {
             'present_id': self.present_id,
             'expire_ts': self.expire_ts,
-            'description': self.description,
+            'description': self.description
-            'items': [x.to_dict() for x in self.items]
         }
+        if has_items:
+            r['items'] = [x.to_dict() for x in self.items]
+        return r
 
-    def select(self, present_id: str = None) -> None:
+    def from_dict(self, d: dict) -> 'Present':
+        self.present_id = d['present_id']
+        self.expire_ts = int(d['expire_ts'])
+        self.description = d.get('description', '')
+        self.items = [ItemFactory.from_dict(
+            i, c=self.c) for i in d.get('items', [])]
+        return self
+
+    def from_list(self, l: list) -> 'Present':
+        self.present_id = l[0]
+        self.expire_ts = int(l[1]) if l[1] else 0
+        self.description = l[2] if l[2] else ''
+        return self
+
+    def select_exists(self) -> bool:
+        '''
+            查询present是否存在
+        '''
+        self.c.execute(
+            '''select exists(select * from present where present_id=?)''', (self.present_id,))
+        return bool(self.c.fetchone()[0])
+
+    def select(self, present_id: str = None) -> 'Present':
         '''
             用present_id查询信息
         '''
@@ -39,8 +70,8 @@ class Present:
         if x is None:
             raise NoData('The present `%s` does not exist.' % self.present_id)
 
-        self.expire_ts = x[1] if x[1] else 0
+        self.from_list(x)
-        self.description = x[2] if x[2] else ''
+        return self
 
     def select_items(self) -> None:
         '''
@@ -48,21 +79,49 @@ class Present:
         '''
         self.c.execute(
             '''select * from present_item where present_id=:a''', {'a': self.present_id})
-        x = self.c.fetchall()
-        if not x:
-            raise NoData('The present `%s` does not have any items.' %
-                         self.present_id)
         self.items = [ItemFactory.from_dict({
             'item_id': i[1],
             'type': i[2],
             'amount': i[3] if i[3] else 1
-        }, self.c) for i in x]
+        }, self.c) for i in self.c.fetchall()]
+
+    def insert_items(self) -> None:
+        for i in self.items:
+            self.c.execute('''insert or ignore into item values(?,?,?)''',
+                           (i.item_id, i.item_type, i.is_available))
+
+            self.c.execute('''insert or ignore into present_item values(?,?,?,?)''',
+                           (self.present_id, i.item_id, i.item_type, i.amount))
+
+    def insert(self) -> None:
+        self.c.execute('''insert into present values(?,?,?)''',
+                       (self.present_id, self.expire_ts, self.description))
+
+    def insert_all(self) -> None:
+        self.insert()
+        self.insert_items()
+
+    def delete(self) -> None:
+        self.c.execute(
+            '''delete from present where present_id=?''', (self.present_id,))
+
+    def delete_present_item(self) -> None:
+        self.c.execute(
+            '''delete from present_item where present_id=?''', (self.present_id,))
+
+    def delete_all(self) -> None:
+        self.delete_present_item()
+        self.delete()
+
+    def update(self) -> None:
+        self.c.execute('''update present set expire_ts=?, description=? where present_id=?''',
+                       (self.expire_ts, self.description, self.present_id))
 
 
 class UserPresent(Present):
     '''
-        用户登录奖励类\ 
+        用户登录奖励类
-        忽视了description的多语言\ 
+        忽视了description的多语言
         properties: `user` - `User`类或子类的实例
     '''
 

latest version/core/purchase.py

@@ -1,14 +1,21 @@
 from time import time
 
-from .error import NoData, TicketNotEnough
+from .error import InputError, NoData, TicketNotEnough
-from .item import ItemFactory
+from .item import CollectionItemMixin, ItemFactory
 
 
-class Purchase:
+class Purchase(CollectionItemMixin):
     '''
-        购买类\ 
+        购买类
         properties: `user` - `User`类或子类的实例
     '''
+    collection_item_const = {
+        'name': 'purchase',
+        'table_name': 'purchase_item',
+        'table_primary_key': 'purchase_name',
+        'id_name': 'purchase_name',
+        'items_name': 'items'
+    }
 
     def __init__(self, c=None, user=None):
         self.c = c
@@ -22,6 +29,8 @@ class Purchase:
 
         self.items: list = []
 
+        # TODO: "discount_reason": "extend"
+
     @property
     def price_displayed(self) -> int:
         '''
@@ -32,31 +41,35 @@ class Purchase:
                 if self.discount_reason == 'anni5tix':
                     x = ItemFactory(self.c).get_item('anni5tix')
                     x.item_id = 'anni5tix'
-                    x.select(self.user)
+                    x.select_user_item(self.user)
                     if x.amount >= 1:
                         return 0
                 return self.price
         return self.orig_price
 
-    def to_dict(self) -> dict:
+    def to_dict(self, has_items: bool = True, show_real_price: bool = True) -> dict:
+        if show_real_price:
             price = self.price_displayed
         r = {
             'name': self.purchase_name,
-            'price': price,
+            'price': price if show_real_price else self.price,
             'orig_price': self.orig_price,
-            'items': [x.to_dict(has_is_available=True) for x in self.items]
         }
+        if has_items:
+            r['items'] = [x.to_dict(has_is_available=True) for x in self.items]
         if self.discount_from > 0 and self.discount_to > 0:
             r['discount_from'] = self.discount_from
             r['discount_to'] = self.discount_to
-            if self.discount_reason == 'anni5tix' and price == 0:
+            if not show_real_price or (self.discount_reason == 'anni5tix' and price == 0):
                 r['discount_reason'] = self.discount_reason
         return r
 
     def from_dict(self, d: dict) -> 'Purchase':
-        self.purchase_name = d['name']
+        self.purchase_name = d.get('name') or d.get('purchase_name')
-        self.price = d['price']
+        if not self.purchase_name:
-        self.orig_price = d['orig_price']
+            raise InputError('purchase_name is required')
+        self.orig_price = int(d['orig_price'])
+        self.price = d.get('price', self.orig_price)
         self.discount_from = d.get('discount_from', -1)
         self.discount_to = d.get('discount_to', -1)
         self.discount_reason = d.get('discount_reason', '')
@@ -65,24 +78,50 @@ class Purchase:
 
         return self
 
+    def from_list(self, l: list) -> 'Purchase':
+        self.purchase_name = l[0]
+        self.price = l[1]
+        self.orig_price = l[2]
+        self.discount_from = l[3] if l[3] else -1
+        self.discount_to = l[4] if l[4] else -1
+        self.discount_reason = l[5] if l[5] else ''
+        return self
+
     def insert_all(self) -> None:
         '''向数据库插入，包括item表和purchase_item表'''
+        self.insert()
+        self.insert_items()
+
+    def insert(self) -> None:
+        '''向数据库插入，不包括item表和purchase_item表'''
         self.c.execute('''insert into purchase values(?,?,?,?,?,?)''',
                        (self.purchase_name, self.price, self.orig_price, self.discount_from, self.discount_to, self.discount_reason))
-        self.insert_items()
+
+    # def insert_only_purchase_item(self) -> None:
+    #     '''向数据库插入purchase_item表'''
+    #     for i in self.items:
+    #         self.c.execute('''insert into purchase_item values(?,?,?,?)''',
+    #                        (self.purchase_name, i.item_id, i.item_type, i.amount))
 
     def insert_items(self) -> None:
         '''向数据库插入物品，注意已存在的物品不会变更'''
         for i in self.items:
-            self.c.execute(
+            self.c.execute('''insert or ignore into item values(?,?,?)''',
-                '''select exists(select * from item where item_id=?)''', (i.item_id,))
-            if self.c.fetchone() == (0,):
-                self.c.execute('''insert into item values(?,?,?)''',
                            (i.item_id, i.item_type, i.is_available))
 
-            self.c.execute('''insert into purchase_item values(?,?,?,?)''',
+            self.c.execute('''insert or ignore into purchase_item values(?,?,?,?)''',
                            (self.purchase_name, i.item_id, i.item_type, i.amount))
 
+    def select_exists(self, purchase_name: str = None) -> bool:
+        '''
+            用purchase_name查询存在性
+        '''
+        if purchase_name:
+            self.purchase_name = purchase_name
+        self.c.execute(
+            '''select exists(select * from purchase where purchase_name=?)''', (self.purchase_name,))
+        return self.c.fetchone() == (1,)
+
     def select(self, purchase_name: str = None) -> 'Purchase':
         '''
             用purchase_name查询信息
@@ -91,11 +130,11 @@ class Purchase:
             self.purchase_name = purchase_name
 
         self.c.execute(
-            '''select * from purchase where purchase_name=:name''', {'name': purchase_name})
+            '''select * from purchase where purchase_name=:name''', {'name': self.purchase_name})
         x = self.c.fetchone()
         if not x:
-            raise NoData('The purchase `%s` does not exist.' %
+            raise NoData(
-                         purchase_name, 501)
+                f'Purchase `{self.purchase_name}` does not exist.', 501)
 
         self.price = x[1]
         self.orig_price = x[2]
@@ -110,9 +149,9 @@ class Purchase:
         self.c.execute(
             '''select item_id, type, amount from purchase_item where purchase_name=:a''', {'a': self.purchase_name})
         x = self.c.fetchall()
-        if not x:
+        # if not x:
-            raise NoData('The items of the purchase `%s` does not exist.' %
+        #     raise NoData(
-                         self.purchase_name, 501)
+        #         f'The items of the purchase `{self.purchase_name}` does not exist.', 501)
 
         self.items = []
         t = None
@@ -160,10 +199,31 @@ class Purchase:
         for i in self.items:
             i.user_claim_item(self.user)
 
+    def delete_purchase_item(self) -> None:
+        '''删除purchase_item表'''
+        self.c.execute(
+            '''delete from purchase_item where purchase_name=?''', (self.purchase_name, ))
+
+    def delete(self) -> None:
+        '''删除purchase表'''
+        self.c.execute(
+            '''delete from purchase where purchase_name=?''', (self.purchase_name, ))
+
+    def delete_all(self) -> None:
+        '''删除purchase表和purchase_item表'''
+        self.delete_purchase_item()
+        self.delete()
+
+    def update(self) -> None:
+        '''更新purchase表'''
+        self.c.execute('''update purchase set price=:a, orig_price=:b, discount_from=:c, discount_to=:d, discount_reason=:e where purchase_name=:f''', {
+                       'a': self.price, 'b': self.orig_price, 'c': self.discount_from, 'd': self.discount_to, 'e': self.discount_reason, 'f': self.purchase_name})
+
 
 class PurchaseList:
     '''
-        购买列表类\ 
+        购买列表类
+
         property: `user` - `User`类或子类的实例
     '''
 

latest version/core/rank.py

@@ -7,8 +7,9 @@ from .user import UserInfo
 
 class RankList:
     '''
-        排行榜类\ 
+        排行榜类
-        默认limit=20，limit<0认为是all\ 
+        默认limit=20，limit<0认为是all
+
         property: `user` - `User`类或者子类的实例
     '''
 
@@ -85,7 +86,8 @@ class RankList:
     @staticmethod
     def get_my_rank_parameter(my_rank: int, amount: int, all_limit: int = 20, max_local_position: int = Constant.MY_RANK_MAX_LOCAL_POSITION, max_global_position: int = Constant.MY_RANK_MAX_GLOBAL_POSITION):
         '''
-            计算我的排名中的查询参数\ 
+            计算我的排名中的查询参数
+
             returns:
             `sql_limit`: int - 查询limit参数
             `sql_offset`: int - 查询offset参数
@@ -103,7 +105,7 @@ class RankList:
             need_myself = True
         elif amount - my_rank < all_limit - max_local_position:  # 后方人数不足，显示排名
             sql_offset = amount - all_limit
-        elif my_rank >= max_local_position and my_rank <= max_global_position - all_limit + max_local_position - 1:  # 前方人数足够，显示排名
+        elif max_local_position <= my_rank <= max_global_position - all_limit + max_local_position - 1:  # 前方人数足够，显示排名
             sql_offset = my_rank - max_local_position
         else:  # 我已经忘了这是什么了
             sql_offset = max_global_position - all_limit

latest version/core/redeem.py

@@ -1,8 +1,16 @@
 from .error import NoData, RedeemUnavailable
-from .item import ItemFactory
+from .item import CollectionItemMixin, ItemFactory
 
 
-class Redeem:
+class Redeem(CollectionItemMixin):
+    collection_item_const = {
+        'name': 'redeem',
+        'table_name': 'redeem_item',
+        'table_primary_key': 'code',
+        'id_name': 'code',
+        'items_name': 'items'
+    }
+
     def __init__(self, c=None) -> None:
         self.c = c
         self.code: str = None
@@ -11,34 +19,87 @@ class Redeem:
         self.items: list = []
         self.fragment: int = None
 
-    def select(self, code: str = None) -> None:
+    def to_dict(self, has_items: bool = True) -> dict:
+        r = {
+            'code': self.code,
+            'type': self.redeem_type
+        }
+        if has_items:
+            r['items'] = [x.to_dict() for x in self.items]
+        return r
+
+    def from_dict(self, d: dict) -> 'Redeem':
+        self.code = str(d['code'])
+        self.redeem_type = int(d.get('type') or d.get('redeem_type', 0))
+        self.items = [ItemFactory.from_dict(
+            i, c=self.c) for i in d.get('items', [])]
+        return self
+
+    def from_list(self, l: list) -> 'Redeem':
+        self.code = l[0]
+        self.redeem_type = l[1]
+        return self
+
+    def select_exists(self) -> bool:
+        self.c.execute(
+            '''select exists(select * from redeem where code=?)''', (self.code,))
+        return bool(self.c.fetchone()[0])
+
+    def select(self, code: str = None) -> 'Redeem':
         if code:
             self.code = code
         self.c.execute('''select * from redeem where code=:a''',
                        {'a': self.code})
         x = self.c.fetchone()
         if x is None:
-            raise NoData('The redeem `%s` does not exist.' % self.code, 504)
+            raise NoData(f'The redeem `{self.code}` does not exist.', 504)
 
         self.redeem_type = x[1]
+        return self
 
     def select_items(self) -> None:
         self.c.execute('''select * from redeem_item where code=:a''',
                        {'a': self.code})
-        x = self.c.fetchall()
-        if not x:
-            raise NoData(
-                'The redeem `%s` does not have any items.' % self.code)
         self.items = [ItemFactory.from_dict({
             'item_id': i[1],
             'type': i[2],
             'amount': i[3] if i[3] else 1
-        }, self.c) for i in x]
+        }, self.c) for i in self.c.fetchall()]
+
+    def insert(self) -> None:
+        self.c.execute('''insert into redeem values(?,?)''',
+                       (self.code, self.redeem_type))
+
+    def insert_items(self) -> None:
+        for i in self.items:
+            i.insert(ignore=True)
+            self.c.execute('''insert into redeem_item values(?,?,?,?)''', (
+                self.code, i.item_id, i.item_type, i.amount))
+
+    def insert_all(self) -> None:
+        self.insert()
+        self.insert_items()
+
+    def delete(self) -> None:
+        self.c.execute('''delete from redeem where code=?''', (self.code,))
+
+    def delete_redeem_item(self) -> None:
+        self.c.execute(
+            '''delete from redeem_item where code=?''', (self.code,))
+
+    def delete_all(self) -> None:
+        self.delete_redeem_item()
+        self.delete()
+
+    def update(self) -> None:
+        self.c.execute('''update redeem set type=? where code=?''',
+                       (self.redeem_type, self.code))
 
 
 class UserRedeem(Redeem):
     '''
-        用户兑换码类\ 
+        用户兑换码类
+
         properties: `user` - `User`类或子类的实例
     '''
 
@@ -77,7 +138,7 @@ class UserRedeem(Redeem):
             if self.redeem_type == 0:
                 raise RedeemUnavailable(
                     'The redeem `%s` is unavailable.' % self.code)
-            elif self.redeem_type == 1:
+            if self.redeem_type == 1:
                 raise RedeemUnavailable(
                     'The redeem `%s` is unavailable.' % self.code, 506)
 

latest version/core/save.py

@@ -3,7 +3,7 @@ from time import time
 
 from .config_manager import Config
 from .constant import Constant
-from .error import InputError
+from .error import InputError, NoData
 from .util import md5
 
 
@@ -11,6 +11,8 @@ class SaveData:
 
     def __init__(self, c=None) -> None:
         self.c = c
+        self.user = None
+
         self.scores_data = []
         self.clearlamps_data = []
         self.clearedsongs_data = []
@@ -54,6 +56,20 @@ class SaveData:
             }
         }
 
+    def select_scores(self, user) -> None:
+        '''
+            parameter: `user` - `User`类或子类的实例
+        '''
+        self.user = user
+        self.c.execute('''select scores_data, clearlamps_data from user_save where user_id=:a''',
+                       {'a': user.user_id})
+        x = self.c.fetchone()
+        if not x:
+            raise NoData(f'User `{user.user_id}` has no cloud save data')
+
+        self.scores_data: list = json.loads(x[0])[""]
+        self.clearlamps_data: list = json.loads(x[1])[""]
+
     def select_all(self, user) -> None:
         '''
             parameter: `user` - `User`类或子类的实例
@@ -113,7 +129,7 @@ class SaveData:
                 'Property `%s` is not found in the instance of `SaveData` class.' % key)
 
         if md5(value) == checksum:
-            if key == 'installid_data' or key == 'devicemodelname_data' or key == 'finalestate_data':
+            if key in ('installid_data', 'devicemodelname_data', 'finalestate_data'):
                 self.__dict__[key] = json.loads(value)['val']
             else:
                 self.__dict__[key] = json.loads(value)['']

latest version/core/score.py

@@ -7,13 +7,15 @@ from .course import CoursePlay
 from .error import NoData, StaminaNotEnough
 from .item import ItemCore
 from .song import Chart
-from .sql import Query, Sql
+from .sql import Connect, Query, Sql
 from .util import md5
 from .world import WorldPlay
 
 
 class Score:
     def __init__(self) -> None:
+        self.c = None
+
         self.song: 'Chart' = Chart()
         self.score: int = None
         self.shiny_perfect_count: int = None
@@ -45,17 +47,16 @@ class Score:
         '''分数转换为评级'''
         if score >= 9900000:  # EX+
             return 6
-        elif 9800000 <= score < 9900000:  # EX
+        if score >= 9800000:  # EX
             return 5
-        elif 9500000 <= score < 9800000:  # AA
+        if score >= 9500000:  # AA
             return 4
-        elif 9200000 <= score < 9500000:  # A
+        if score >= 9200000:  # A
             return 3
-        elif 8900000 <= score < 9200000:  # B
+        if score >= 8900000:  # B
             return 2
-        elif 8600000 <= score < 8900000:  # C
+        if score >= 8600000:  # C
             return 1
-        else:
         return 0
 
     @property
@@ -67,21 +68,24 @@ class Score:
         '''clear_type转换为成绩状态，用数字大小标识便于比较'''
         if clear_type == 3:  # PM
             return 5
-        elif clear_type == 2:  # FC
+        if clear_type == 2:  # FC
             return 4
-        elif clear_type == 5:  # Hard Clear
+        if clear_type == 5:  # Hard Clear
             return 3
-        elif clear_type == 1:  # Clear
+        if clear_type == 1:  # Clear
             return 2
-        elif clear_type == 4:  # Easy Clear
+        if clear_type == 4:  # Easy Clear
             return 1
-        else:  # Track Lost
+        return 0  # Track Lost
-            return 0
 
     @property
     def song_state(self) -> int:
         return self.get_song_state(self.clear_type)
 
+    @property
+    def all_note_count(self) -> int:
+        return self.perfect_count + self.near_count + self.miss_count
+
     @property
     def is_valid(self) -> bool:
         '''分数有效性检查'''
@@ -90,7 +94,7 @@ class Score:
         if self.song.difficulty not in (0, 1, 2, 3):
             return False
 
-        all_note = self.perfect_count + self.near_count + self.miss_count
+        all_note = self.all_note_count
         if all_note == 0:
             return False
 
@@ -102,8 +106,8 @@ class Score:
         return True
 
     @staticmethod
-    def calculate_rating(defnum: int, score: int) -> float:
+    def calculate_rating(defnum: float, score: int) -> float:
-        '''计算rating，谱面定数小于等于0视为Unrank，这里的defnum = Chart const'''
+        '''计算rating，谱面定数小于等于0视为Unrank，返回值会为-1，这里的defnum = Chart const'''
         if not defnum or defnum <= 0:
             # 谱面没定数或者定数小于等于0被视作Unrank
             return -1
@@ -112,8 +116,7 @@ class Score:
             ptt = defnum + 2
         elif score < 9800000:
             ptt = defnum + (score-9500000) / 300000
-            if ptt < 0:
+            ptt = max(ptt, 0)
-                ptt = 0
         else:
             ptt = defnum + 1 + (score-9800000) / 200000
 
@@ -209,6 +212,7 @@ class UserPlay(UserScore):
         self.stamina_multiply: int = None
         self.fragment_multiply: int = None
         self.prog_boost_multiply: int = None
+        self.beyond_boost_gauge_usage: int = None
 
         self.ptt: Potential = None  # 临时用来计算用户ptt的
         self.world_play: 'WorldPlay' = None
@@ -216,7 +220,10 @@ class UserPlay(UserScore):
         self.course_play_state: int = None
         self.course_play: 'CoursePlay' = None
 
+        self.combo_interval_bonus: int = None  # 不能给 None 以外的默认值
+
     def to_dict(self) -> dict:
+        # 不能super
         if self.is_world_mode is None or self.course_play_state is None:
             return {}
         if self.course_play_state == 4:
@@ -228,7 +235,7 @@ class UserPlay(UserScore):
         r['user_rating'] = self.user.rating_ptt
         r['finale_challenge_higher'] = self.rating > self.ptt.value
         r['global_rank'] = self.user.global_rank
-        r['finale_play_value'] = self.rating * 5  # emmmm
+        r['finale_play_value'] = 9.065 * self.rating ** 0.5  # by Lost-MSth
         return r
 
     @property
@@ -248,10 +255,15 @@ class UserPlay(UserScore):
         if songfile_hash and songfile_hash != self.song_hash:
             return False
 
-        x = self.song_token + self.song_hash + self.song.song_id + str(self.song.difficulty) + str(self.score) + str(self.shiny_perfect_count) + str(
+        x = f'''{self.song_token}{self.song_hash}{self.song.song_id}{self.song.difficulty}{self.score}{self.shiny_perfect_count}{self.perfect_count}{self.near_count}{self.miss_count}{self.health}{self.modifier}{self.clear_type}'''
-            self.perfect_count) + str(self.near_count) + str(self.miss_count) + str(self.health) + str(self.modifier) + str(self.clear_type)
+        if self.combo_interval_bonus is not None:
-        y = str(self.user.user_id) + self.song_hash
+            if self.combo_interval_bonus < 0 or self.combo_interval_bonus > self.all_note_count / 150:
+                return False
+            x = x + str(self.combo_interval_bonus)
+
+        y = f'{self.user.user_id}{self.song_hash}'
         checksum = md5(x+md5(y))
+
         if checksum != self.submission_hash:
             return False
 
@@ -285,24 +297,29 @@ class UserPlay(UserScore):
             self.stamina_multiply = int(x[8])
             self.fragment_multiply = int(x[9])
             self.prog_boost_multiply = int(x[10])
+            self.beyond_boost_gauge_usage = int(x[11])
             self.is_world_mode = True
             self.course_play_state = -1
 
-    def set_play_state_for_world(self, stamina_multiply: int = 1, fragment_multiply: int = 100, prog_boost_multiply: int = 0) -> None:
+    def set_play_state_for_world(self, stamina_multiply: int = 1, fragment_multiply: int = 100, prog_boost_multiply: int = 0, beyond_boost_gauge_usage: int = 0) -> None:
         self.song_token = b64encode(urandom(64)).decode()
         self.stamina_multiply = int(stamina_multiply)
         self.fragment_multiply = int(fragment_multiply)
         self.prog_boost_multiply = int(prog_boost_multiply)
-        if self.prog_boost_multiply != 0:
+        self.beyond_boost_gauge_usage = int(beyond_boost_gauge_usage)
-            self.c.execute('''select prog_boost from user where user_id=:a''', {
+        if self.prog_boost_multiply != 0 or self.beyond_boost_gauge_usage != 0:
+            self.c.execute('''select prog_boost, beyond_boost_gauge from user where user_id=:a''', {
                            'a': self.user.user_id})
             x = self.c.fetchone()
-            if x and x[0] == 300:
+            if x:
-                self.prog_boost_multiply = 300
+                self.prog_boost_multiply = 300 if x[0] == 300 else 0
+                if x[1] < self.beyond_boost_gauge_usage or self.beyond_boost_gauge_usage not in (100, 200):
+                    # 注意：偷懒了，没判断是否是beyond图
+                    self.beyond_boost_gauge_usage = 0
 
         self.clear_play_state()
-        self.c.execute('''insert into songplay_token values(:t,:a,:b,:c,'',-1,0,0,:d,:e,:f)''', {
+        self.c.execute('''insert into songplay_token values(:t,:a,:b,:c,'',-1,0,0,:d,:e,:f,:g)''', {
-            'a': self.user.user_id, 'b': self.song.song_id, 'c': self.song.difficulty, 'd': self.stamina_multiply, 'e': self.fragment_multiply, 'f': self.prog_boost_multiply, 't': self.song_token})
+            'a': self.user.user_id, 'b': self.song.song_id, 'c': self.song.difficulty, 'd': self.stamina_multiply, 'e': self.fragment_multiply, 'f': self.prog_boost_multiply, 'g': self.beyond_boost_gauge_usage, 't': self.song_token})
 
         self.user.select_user_about_current_map()
         self.user.current_map.select_map_info()
@@ -334,7 +351,7 @@ class UserPlay(UserScore):
         self.course_play.score = 0
         self.course_play.clear_type = 3  # 设置为PM，即最大值
 
-        self.c.execute('''insert into songplay_token values(?,?,?,?,?,?,?,?,1,100,0)''', (self.song_token, self.user.user_id, self.song.song_id,
+        self.c.execute('''insert into songplay_token values(?,?,?,?,?,?,?,?,1,100,0,0)''', (self.song_token, self.user.user_id, self.song.song_id,
                                                                                             self.song.difficulty, self.course_play.course_id, self.course_play_state, self.course_play.score, self.course_play.clear_type))
         self.user.select_user_about_stamina()
         if use_course_skip_purchase:
@@ -368,8 +385,8 @@ class UserPlay(UserScore):
         '''更新此分数对应用户的recent30'''
         old_recent_10 = self.ptt.recent_10
         if self.is_protected:
-            old_r30 = [x for x in self.ptt.r30]
+            old_r30 = self.ptt.r30.copy()
-            old_s30 = [x for x in self.ptt.s30]
+            old_s30 = self.ptt.s30.copy()
 
         # 寻找pop位置
         songs = list(set(self.ptt.s30))
@@ -408,6 +425,12 @@ class UserPlay(UserScore):
 
         self.ptt.insert_recent_30()
 
+    def record_score(self) -> None:
+        '''向log数据库记录分数，请注意列名不同'''
+        with Connect(Constant.SQLITE_LOG_DATABASE_PATH) as c2:
+            c2.execute('''insert into user_score values(?,?,?,?,?,?,?,?,?,?,?,?,?)''', (self.user.user_id, self.song.song_id, self.song.difficulty, self.time_played,
+                                                                                        self.score, self.shiny_perfect_count, self.perfect_count, self.near_count, self.miss_count, self.health, self.modifier, self.clear_type, self.rating))
+
     def upload_score(self) -> None:
         '''上传分数，包括user的recent更新，best更新，recent30更新，世界模式计算'''
         self.get_play_state()
@@ -420,6 +443,9 @@ class UserPlay(UserScore):
 
         self.time_played = int(time())
 
+        # 记录分数
+        self.record_score()
+
         # recent更新
         self.c.execute('''update user set song_id = :b, difficulty = :c, score = :d, shiny_perfect_count = :e, perfect_count = :f, near_count = :g, miss_count = :h, health = :i, modifier = :j, clear_type = :k, rating = :l, time_played = :m  where user_id = :a''', {
             'a': self.user.user_id, 'b': self.song.song_id, 'c': self.song.difficulty, 'd': self.score, 'e': self.shiny_perfect_count, 'f': self.perfect_count, 'g': self.near_count, 'h': self.miss_count, 'i': self.health, 'j': self.modifier, 'k': self.clear_type, 'l': self.rating, 'm': self.time_played * 1000})
@@ -464,7 +490,8 @@ class UserPlay(UserScore):
 
 class Potential:
     '''
-        用户潜力值计算处理类\ 
+        用户潜力值计算处理类
+
         property: `user` - `User`类或子类的实例
     '''
 
@@ -472,8 +499,8 @@ class Potential:
         self.c = c
         self.user = user
 
-        self.r30: list = None
+        self.r30: 'list[float]' = None
-        self.s30: list = None
+        self.s30: 'list[str]' = None
         self.songs_selected: list = None
 
         self.b30: list = None
@@ -488,7 +515,7 @@ class Potential:
         '''获取用户best30的总潜力值'''
         self.c.execute('''select rating from best_score where user_id = :a order by rating DESC limit 30''', {
             'a': self.user.user_id})
-        return sum([x[0] for x in self.c.fetchall()])
+        return sum(x[0] for x in self.c.fetchall())
 
     def select_recent_30(self) -> None:
         '''获取用户recent30数据'''
@@ -563,7 +590,8 @@ class Potential:
 
 class UserScoreList:
     '''
-        用户分数查询类\ 
+        用户分数查询类
+
         properties: `user` - `User`类或子类的实例
     '''
 

latest version/core/song.py

@@ -1,4 +1,5 @@
 from .error import NoData
+from .config_manager import Config
 
 
 class Chart:
@@ -6,6 +7,8 @@ class Chart:
 
     def __init__(self, c=None, song_id: str = None, difficulty: int = None) -> None:
         self.c = c
+        self.song_id: str = None
+        self.difficulty: int = None
         self.set_chart(song_id, difficulty)
         self.defnum: int = None
         self.song_name: str = None
@@ -33,14 +36,16 @@ class Chart:
             '''select rating_pst, rating_prs, rating_ftr, rating_byn from chart where song_id=:a''', {'a': self.song_id})
         x = self.c.fetchone()
         if x is None:
+            if Config.ALLOW_SCORE_WITH_NO_SONG:
                 self.defnum = -10
-            # raise NoData('The song `%s` does not exist.' % self.song_id)
+            else:
+                raise NoData(f'The song `{self.song_id}` does not exist.', 120)
         else:
             self.defnum = x[self.difficulty]
 
 
 class Song:
-    def __init__(self, c=None, song_id=None) -> None:
+    def __init__(self, c=None, song_id: str = None) -> None:
         self.c = c
         self.song_id: str = song_id
         self.name: str = None
@@ -65,10 +70,39 @@ class Song:
         self.charts[3].defnum = x[5]
         return self
 
+    def from_dict(self, d: dict) -> 'Song':
+        self.song_id = d['song_id']
+        self.name = d.get('name', '')
+        self.charts = [Chart(self.c, self.song_id, 0), Chart(self.c, self.song_id, 1), Chart(
+            self.c, self.song_id, 2), Chart(self.c, self.song_id, 3)]
+        for i in range(4):
+            self.charts[i].defnum = -10
+        for chart in d['charts']:
+            self.charts[chart['difficulty']].defnum = round(
+                chart['chart_const'] * 10)
+        return self
+
+    def delete(self) -> None:
+        self.c.execute(
+            '''delete from chart where song_id=?''', (self.song_id,))
+
+    def update(self) -> None:
+        '''全部更新'''
+        self.c.execute(
+            '''update chart set name=?, rating_pst=?, rating_prs=?, rating_ftr=?, rating_byn=? where song_id=?''', (self.name, self.charts[0].defnum, self.charts[1].defnum, self.charts[2].defnum, self.charts[3].defnum, self.song_id))
+
     def insert(self) -> None:
         self.c.execute(
             '''insert into chart values (?,?,?,?,?,?)''', (self.song_id, self.name, self.charts[0].defnum, self.charts[1].defnum, self.charts[2].defnum, self.charts[3].defnum))
 
+    def select_exists(self, song_id: str = None) -> bool:
+        if song_id is not None:
+            self.song_id = song_id
+
+        self.c.execute(
+            '''select exists(select * from chart where song_id=?)''', (self.song_id,))
+        return bool(self.c.fetchone()[0])
+
     def select(self, song_id: str = None) -> 'Song':
         if song_id is not None:
             self.song_id = song_id
@@ -77,6 +111,6 @@ class Song:
                        'a': self.song_id})
         x = self.c.fetchone()
         if x is None:
-            raise NoData('The song `%s` does not exist.' % self.song_id)
+            raise NoData(f'The song `{self.song_id}` does not exist.')
 
         return self.from_list(x)

latest version/core/sql.py

@@ -2,23 +2,27 @@ import sqlite3
 import traceback
 from atexit import register
 
-from flask import current_app
-
 from .constant import Constant
 from .error import ArcError, InputError
 
 
 class Connect:
     # 数据库连接类，上下文管理
+    logger = None
 
-    def __init__(self, file_path: str = Constant.SQLITE_DATABASE_PATH, in_memory: bool = False):
+    def __init__(self, file_path: str = Constant.SQLITE_DATABASE_PATH, in_memory: bool = False, logger=None) -> None:
         """
-            数据库连接，默认连接arcaea_database.db\ 
+            数据库连接，默认连接arcaea_database.db
-            接受：文件路径\ 
+            接受：文件路径
             返回：sqlite3连接操作对象
         """
         self.file_path = file_path
         self.in_memory: bool = in_memory
+        if logger is not None:
+            self.logger = logger
+
+        self.conn: sqlite3.Connection = None
+        self.c: sqlite3.Cursor = None
 
     def __enter__(self) -> sqlite3.Cursor:
         if self.in_memory:
@@ -37,7 +41,7 @@ class Connect:
             else:
                 self.conn.rollback()
 
-                current_app.logger.error(
+                self.logger.error(
                     traceback.format_exception(exc_type, exc_val, exc_tb))
 
         self.conn.commit()
@@ -49,9 +53,9 @@ class Connect:
 class Query:
     '''查询参数类'''
 
-    def __init__(self, query_able: list = None, quzzy_query_able: list = None, sort_able: list = None) -> None:
+    def __init__(self, query_able: list = None, fuzzy_query_able: list = None, sort_able: list = None) -> None:
         self.query_able: list = query_able  # None表示不限制
-        self.quzzy_query_able: list = quzzy_query_able  # None表示不限制
+        self.fuzzy_query_able: list = fuzzy_query_able  # None表示不限制
         self.sort_able: list = sort_able
 
         self.__limit: int = -1
@@ -115,7 +119,7 @@ class Query:
     def fuzzy_query_append(self, fuzzy_query: dict) -> None:
         if not isinstance(fuzzy_query, dict):
             raise InputError(api_error_code=-101)
-        if self.quzzy_query_able is not None and fuzzy_query and not set(fuzzy_query).issubset(set(self.quzzy_query_able)):
+        if self.fuzzy_query_able is not None and fuzzy_query and not set(fuzzy_query).issubset(set(self.fuzzy_query_able)):
             raise InputError(api_error_code=-102)
         if not self.__fuzzy_query:
             self.__fuzzy_query = fuzzy_query
@@ -143,19 +147,19 @@ class Query:
                         raise InputError(api_error_code=-104)
         self.__sort = sort
 
-    def set_value(self, limit=-1, offset=0, query={}, fuzzy_query={}, sort=[]) -> None:
+    def set_value(self, limit=-1, offset=0, query=None, fuzzy_query=None, sort=None) -> None:
         self.limit = limit
         self.offset = offset
-        self.query = query
+        self.query = query if query is not None else {}
-        self.fuzzy_query = fuzzy_query
+        self.fuzzy_query = fuzzy_query if fuzzy_query is not None else {}
-        self.sort = sort
+        self.sort = sort if sort is not None else []
 
     def from_dict(self, d: dict) -> 'Query':
         self.set_value(d.get('limit', -1), d.get('offset', 0),
                        d.get('query', {}), d.get('fuzzy_query', {}), d.get('sort', []))
         return self
 
-    def from_args(self, query: dict, limit: int = -1, offset: int = 0, sort: list = [], fuzzy_query: dict = {}) -> 'Query':
+    def from_args(self, query: dict, limit: int = -1, offset: int = 0, sort: list = None, fuzzy_query: dict = None) -> 'Query':
         self.set_value(limit, offset, query, fuzzy_query, sort)
         return self
 
@@ -169,7 +173,7 @@ class Sql:
         self.c = c
 
     @staticmethod
-    def get_select_sql(table_name: str, target_column: list = [], query: 'Query' = None):
+    def get_select_sql(table_name: str, target_column: list = None, query: 'Query' = None):
         '''拼接单表内行查询单句sql语句，返回语句和参数列表'''
         sql_list = []
         if not target_column:
@@ -209,14 +213,16 @@ class Sql:
         return sql, sql_list
 
     @staticmethod
-    def get_insert_sql(table_name: str, key: list = [], value_len: int = None, insert_type: str = None) -> str:
+    def get_insert_sql(table_name: str, key: list = None, value_len: int = None, insert_type: str = None) -> str:
         '''拼接insert语句，请注意只返回sql语句，insert_type为replace或ignore'''
+        if key is None:
+            key = []
         insert_type = 'replace' if insert_type in [
             'replace', 'R', 'r', 'REPLACE'] else 'ignore'
         return ('insert into ' if insert_type is None else 'insert or ' + insert_type + ' into ') + table_name + ('(' + ','.join(key) + ')' if key else '') + ' values(' + ','.join(['?'] * (len(key) if value_len is None else value_len)) + ')'
 
     @staticmethod
-    def get_update_sql(table_name: str, d: dict = {}, query: 'Query' = None) -> str:
+    def get_update_sql(table_name: str, d: dict = None, query: 'Query' = None):
         if not d:
             return None
         sql_list = []
@@ -245,6 +251,13 @@ class Sql:
 
         return sql, sql_list
 
+    @staticmethod
+    def get_update_many_sql(table_name: str, key: list = None, where_key: list = None) -> str:
+        '''拼接update语句，这里不用Query类，也不用字典，请注意只返回sql语句'''
+        if not key or not where_key:
+            return None
+        return f"update {table_name} set {','.join([f'{k}=?' for k in key])} where {' and '.join([f'{k}=?' for k in where_key])}"
+
     @staticmethod
     def get_delete_sql(table_name: str, query: 'Query' = None):
         '''拼接删除语句，query中只有query和fuzzy_query会被处理'''
@@ -273,13 +286,13 @@ class Sql:
 
         return sql, sql_list
 
-    def select(self, table_name: str, target_column: list = [], query: 'Query' = None) -> list:
+    def select(self, table_name: str, target_column: list = None, query: 'Query' = None) -> list:
         '''单表内行select单句sql语句，返回fetchall数据'''
         sql, sql_list = self.get_select_sql(table_name, target_column, query)
         self.c.execute(sql, sql_list)
         return self.c.fetchall()
 
-    def select_exists(self, table_name: str, target_column: list = [], query: 'Query' = None) -> bool:
+    def select_exists(self, table_name: str, target_column: list = None, query: 'Query' = None) -> bool:
         '''单表内行select exists单句sql语句，返回bool值'''
         sql, sql_list = self.get_select_sql(table_name, target_column, query)
         self.c.execute('select exists(' + sql + ')', sql_list)
@@ -304,6 +317,13 @@ class Sql:
         sql, sql_list = self.get_update_sql(table_name, d, query)
         self.c.execute(sql, sql_list)
 
+    def update_many(self, table_name: str, key: list, value_list: list, where_key: list, where_value_list: list) -> None:
+        '''单表内行update多句sql语句，这里不用Query类，也不用字典，要求值list长度一致，有点像insert_many'''
+        if not key or not value_list or not where_key or not where_value_list or not len(key) == len(value_list[0]) or not len(where_key) == len(where_value_list[0]) or not len(value_list) == len(where_value_list):
+            raise ValueError
+        self.c.executemany(self.get_update_many_sql(
+            table_name, key, where_key), [x + y for x, y in zip(value_list, where_value_list)])
+
     def delete(self, table_name: str, query: 'Query' = None) -> None:
         '''删除，query中只有query和fuzzy_query会被处理'''
         sql, sql_list = self.get_delete_sql(table_name, query)
@@ -314,7 +334,7 @@ class Sql:
         pk = []
         name = []
 
-        self.c.execute('''pragma table_info ("%s")''' % table_name)  # 这里无法参数化
+        self.c.execute(f'''pragma table_info ("{table_name}")''')  # 这里无法参数化
         x = self.c.fetchall()
         if x:
             for i in x:
@@ -348,8 +368,10 @@ class DatabaseMigrator:
         if db1_pk != db2_pk:
             return False
 
-        sql2.insert_many(table_name, [], sql1.select(
+        public_column = list(filter(lambda x: x in db2_name, db1_name))
-            table_name, list(filter(lambda x: x in db2_name, db1_name))), insert_type='replace')
+
+        sql2.insert_many(table_name, public_column, sql1.select(
+            table_name, public_column), insert_type='replace')
 
         return True
 
@@ -366,13 +388,6 @@ class DatabaseMigrator:
             c.executemany('''insert into user_char_full values(?,?,?,?,?,?)''', [
                           (j[0], i[0], i[1], exp, i[2], 0) for j in y])
 
-    @staticmethod
-    def update_user_epilogue(c) -> None:
-        '''给用户添加epilogue包'''
-        c.execute('''select user_id from user''')
-        Sql(c).insert_many('user_item', [], [(i[0], 'epilogue', 'pack', 1)
-                                             for i in c.fetchall()], insert_type='ignore')
-
     def update_database(self) -> None:
         '''
         将c1数据库不存在数据加入或覆盖到c2数据库上
@@ -380,14 +395,13 @@ class DatabaseMigrator:
         '''
         with Connect(self.c2_path) as c2:
             with Connect(self.c1_path) as c1:
-                [self.update_one_table(c1, c2, i)
+                for i in Constant.DATABASE_MIGRATE_TABLES:
-                 for i in Constant.DATABASE_MIGRATE_TABLES]
+                    self.update_one_table(c1, c2, i)
 
                 if not Constant.UPDATE_WITH_NEW_CHARACTER_DATA:
                     self.update_one_table(c1, c2, 'character')
 
             self.update_user_char_full(c2)  # 更新user_char_full
-            self.update_user_epilogue(c2)  # 更新user的epilogue
 
 
 class MemoryDatabase:

latest version/core/system.py

@@ -13,7 +13,7 @@ class GameInfo:
             "stamina_recover_tick": Constant.STAMINA_RECOVER_TICK,
             "core_exp": Constant.CORE_EXP,
             "curr_ts": int(time()*1000),
-            "level_steps": [{'level': i, 'level_exp': Constant.LEVEL_STEPS[i]} for i in Constant.LEVEL_STEPS],
+            "level_steps": [{'level': k, 'level_exp': v} for k, v in Constant.LEVEL_STEPS.items()],
             "world_ranking_enabled": True,
             "is_byd_chapter_unlocked": True
         }

latest version/core/user.py

@@ -2,6 +2,7 @@ import base64
 import hashlib
 import time
 from os import urandom
+from random import randint
 
 from .character import UserCharacter, UserCharacterList
 from .config_manager import Config
@@ -100,7 +101,6 @@ class UserRegister(User):
 
     def _build_user_code(self):
         # 生成9位的user_code，用的自然是随机
-        from random import randint
         random_times = 0
 
         while random_times <= 1000:
@@ -243,8 +243,9 @@ class UserLogin(User):
                        'name': self.name})
         x = self.c.fetchone()
         if x is None:
-            raise NoData('Username does not exist.', 104)
+            raise NoData(f'Username `{self.name}` does not exist.', 104)
 
+        self.user_id = x[0]
         self.now = int(time.time() * 1000)
         if x[2] is not None and x[2] != '':
             # 自动封号检查
@@ -255,14 +256,14 @@ class UserLogin(User):
 
         if x[1] == '':
             # 账号封禁
-            raise UserBan('The account has been banned.', 106)
+            raise UserBan(
+                f'The account `{self.user_id}` has been banned.', 106)
 
         if x[1] != self.hash_pwd:
             raise NoAccess('Wrong password.', 104)
 
-        self.user_id = str(x[0])
         self.token = base64.b64encode(hashlib.sha256(
-            (self.user_id + str(self.now)).encode("utf8") + urandom(8)).digest()).decode()
+            (str(self.user_id) + str(self.now)).encode("utf8") + urandom(8)).digest()).decode()
 
         self.c.execute(
             '''select login_device from login where user_id = :user_id''', {"user_id": self.user_id})
@@ -304,9 +305,12 @@ class UserInfo(User):
         self.recent_score = Score()
         self.favorite_character = None
         self.max_stamina_notification_enabled = False
-        self.prog_boost = 0
+        self.prog_boost: int = 0
+        self.beyond_boost_gauge: float = 0
         self.next_fragstam_ts: int = None
         self.world_mode_locked_end_ts: int = None
+        self.current_map: 'Map' = None
+        self.stamina: 'UserStamina' = None
 
         self.__cores: list = None
         self.__packs: list = None
@@ -404,7 +408,7 @@ class UserInfo(User):
                 self.c.execute('''select exists(select * from friend where user_id_me = :x and user_id_other = :y)''',
                                {'x': i[0], 'y': self.user_id})
 
-                is_mutual = True if self.c.fetchone() == (1,) else False
+                is_mutual = self.c.fetchone() == (1,)
 
                 you = UserOnline(self.c, i[0])
                 you.select_user()
@@ -495,6 +499,7 @@ class UserInfo(User):
             "is_skill_sealed": self.is_skill_sealed,
             "current_map": self.current_map.map_id,
             "prog_boost": self.prog_boost,
+            "beyond_boost_gauge": self.beyond_boost_gauge,
             "next_fragstam_ts": self.next_fragstam_ts,
             "max_stamina_ts": self.stamina.max_stamina_ts,
             "stamina": self.stamina.stamina,
@@ -552,6 +557,7 @@ class UserInfo(User):
         self.stamina = UserStamina(self.c, self)
         self.stamina.set_value(x[32], x[33])
         self.world_mode_locked_end_ts = x[34] if x[34] else -1
+        self.beyond_boost_gauge = x[35] if x[35] else 0
 
         return self
 
@@ -609,7 +615,7 @@ class UserInfo(User):
             查询user表有关世界模式打歌的信息
         '''
         self.c.execute(
-            '''select character_id, max_stamina_ts, stamina, is_skill_sealed, is_char_uncapped, is_char_uncapped_override, current_map, world_mode_locked_end_ts from user where user_id=?''', (self.user_id,))
+            '''select character_id, max_stamina_ts, stamina, is_skill_sealed, is_char_uncapped, is_char_uncapped_override, current_map, world_mode_locked_end_ts, beyond_boost_gauge from user where user_id=?''', (self.user_id,))
         x = self.c.fetchone()
         if not x:
             raise NoData('No user.', 108, -3)
@@ -622,6 +628,7 @@ class UserInfo(User):
         self.character.is_uncapped_override = x[5] == 1
         self.current_map = UserMap(self.c, x[6], self)
         self.world_mode_locked_end_ts = x[7] if x[7] else -1
+        self.beyond_boost_gauge = x[8] if x[8] else 0
 
     @property
     def global_rank(self) -> int:
@@ -655,16 +662,16 @@ class UserInfo(User):
 
         score_sum = 0
         if len(song_list_ftr) >= 2:
-            self.c.execute('''select sum(score) from best_score where user_id=? and difficulty=2 and song_id in ({0})'''.format(
+            self.c.execute(
-                ','.join(['?']*(len(song_list_ftr)-1))), tuple(song_list_ftr))
+                f'''select sum(score) from best_score where user_id=? and difficulty=2 and song_id in ({','.join(['?']*(len(song_list_ftr)-1))})''', tuple(song_list_ftr))
 
             x = self.c.fetchone()
             if x[0] is not None:
                 score_sum += x[0]
 
         if len(song_list_byn) >= 2:
-            self.c.execute('''select sum(score) from best_score where user_id=? and difficulty=3 and song_id in ({0})'''.format(
+            self.c.execute(
-                ','.join(['?']*(len(song_list_byn)-1))), tuple(song_list_byn))
+                f'''select sum(score) from best_score where user_id=? and difficulty=3 and song_id in ({','.join(['?']*(len(song_list_byn)-1))})''', tuple(song_list_byn))
 
             x = self.c.fetchone()
             if x[0] is not None:
@@ -677,13 +684,13 @@ class UserInfo(User):
 
     def select_user_one_column(self, column_name: str, default_value=None) -> None:
         '''
-            查询user表的某个属性\ 
+            查询user表的某个属性
             请注意必须是一个普通属性，不能是一个类的实例
         '''
         if column_name not in self.__dict__:
             raise InputError('No such column.')
-        self.c.execute('''select %s from user where user_id = :a''' %
+        self.c.execute(f'''select {column_name} from user where user_id = :a''', {
-                       column_name, {'a': self.user_id})
+                       'a': self.user_id})
         x = self.c.fetchone()
         if not x:
             raise NoData('No user.', 108, -3)
@@ -692,15 +699,15 @@ class UserInfo(User):
 
     def update_user_one_column(self, column_name: str, value=None) -> None:
         '''
-            更新user表的某个属性\ 
+            更新user表的某个属性
             请注意必须是一个普通属性，不能是一个类的实例
         '''
         if column_name not in self.__dict__:
             raise InputError('No such column.')
         if value is not None:
             self.__dict__[column_name] = value
-        self.c.execute('''update user set %s = :a where user_id = :b''' %
+        self.c.execute(f'''update user set {column_name} = :a where user_id = :b''', {
-                       column_name, {'a': self.__dict__[column_name], 'b': self.user_id})
+                       'a': self.__dict__[column_name], 'b': self.user_id})
 
 
 class UserOnline(UserInfo):

latest version/core/util.py

@@ -13,13 +13,11 @@ def md5(code: str) -> str:
 
 
 def get_file_md5(file_path: str) -> str:
-    '''计算文件MD5'''
+    '''计算文件MD5，假设是文件'''
-    if not os.path.isfile(file_path):
-        return None
     myhash = hashlib.md5()
     with open(file_path, 'rb') as f:
         while True:
-            b = f.read(8096)
+            b = f.read(8192)
             if not b:
                 break
             myhash.update(b)

latest version/core/world.py

@@ -1,6 +1,6 @@
-import json
 import os
 from functools import lru_cache
+from json import load
 from random import random
 from time import time
 
@@ -25,15 +25,15 @@ def get_world_name(file_dir: str = Constant.WORLD_MAP_FOLDER_PATH) -> list:
 def get_world_info(map_id: str) -> dict:
     '''读取json文件内容，返回字典'''
     world_info = {}
-    with open(os.path.join(Constant.WORLD_MAP_FOLDER_PATH, map_id+'.json'), 'r') as f:
+    with open(os.path.join(Constant.WORLD_MAP_FOLDER_PATH, f'{map_id}.json'), 'rb') as f:
-        world_info = json.load(f)
+        world_info = load(f)
 
     return world_info
 
 
 def get_world_all(c, user) -> list:
     '''
-        读取所有地图信息，返回列表\ 
+        读取所有地图信息，返回列表
         parameter: `user` - `User`类或子类的实例
     '''
     worlds = get_world_name()
@@ -44,12 +44,13 @@ class Step:
     '''台阶类'''
 
     def __init__(self) -> None:
-        self.postion: int = None
+        self.position: int = None
         self.capture: int = None
         self.items: list = []
         self.restrict_id: str = None
         self.restrict_ids: list = []
         self.restrict_type: str = None
+        self.restrict_difficulty: int = None
         self.step_type: list = None
         self.speed_limit_value: int = None
         self.plus_stamina_value: int = None
@@ -61,12 +62,14 @@ class Step:
         }
         if self.items:
             r['items'] = [i.to_dict() for i in self.items]
+        if self.restrict_type:
+            r['restrict_type'] = self.restrict_type
             if self.restrict_id:
                 r['restrict_id'] = self.restrict_id
             if self.restrict_ids:
                 r['restrict_ids'] = self.restrict_ids
-        if self.restrict_type:
+            if self.restrict_difficulty is not None:
-            r['restrict_type'] = self.restrict_type
+                r['restrict_difficulty'] = self.restrict_difficulty
         if self.step_type:
             r['step_type'] = self.step_type
         if self.speed_limit_value:
@@ -82,6 +85,7 @@ class Step:
         self.restrict_id = d.get('restrict_id')
         self.restrict_ids = d.get('restrict_ids')
         self.restrict_type = d.get('restrict_type')
+        self.restrict_difficulty = d.get('restrict_difficulty')
         self.step_type = d.get('step_type')
         self.speed_limit_value = d.get('speed_limit_value')
         self.plus_stamina_value = d.get('plus_stamina_value')
@@ -102,7 +106,7 @@ class Map:
         self.available_from: int = None
         self.available_to: int = None
         self.is_repeatable: bool = None
-        self.require_id: str = None
+        self.require_id: 'str | list[str]' = None
         self.require_type: str = None
         self.require_value: int = None
         self.coordinate: str = None
@@ -111,6 +115,10 @@ class Map:
         self.steps: list = []
         self.__rewards: list = None
 
+        self.require_localunlock_songid: str = None
+        self.require_localunlock_challengeid: str = None
+        self.chain_info: dict = None
+
     @property
     def rewards(self) -> list:
         if self.__rewards is None:
@@ -133,7 +141,7 @@ class Map:
     def to_dict(self) -> dict:
         if self.chapter is None:
             self.select_map_info()
-        return {
+        r = {
             'map_id': self.map_id,
             'is_legacy': self.is_legacy,
             'is_beyond': self.is_beyond,
@@ -151,8 +159,13 @@ class Map:
             'custom_bg': self.custom_bg,
             'stamina_cost': self.stamina_cost,
             'step_count': self.step_count,
+            'require_localunlock_songid': self.require_localunlock_songid,
+            'require_localunlock_challengeid': self.require_localunlock_challengeid,
             'steps': [s.to_dict() for s in self.steps],
         }
+        if self.chain_info is not None:
+            r['chain_info'] = self.chain_info
+        return r
 
     def from_dict(self, raw_dict: dict) -> 'Map':
         self.is_legacy = raw_dict.get('is_legacy')
@@ -170,6 +183,11 @@ class Map:
         self.coordinate = raw_dict.get('coordinate')
         self.custom_bg = raw_dict.get('custom_bg', '')
         self.stamina_cost = raw_dict.get('stamina_cost')
+        self.require_localunlock_songid = raw_dict.get(
+            'require_localunlock_songid', '')
+        self.require_localunlock_challengeid = raw_dict.get(
+            'require_localunlock_challengeid', '')
+        self.chain_info = raw_dict.get('chain_info')
         self.steps = [Step().from_dict(s) for s in raw_dict.get('steps')]
         return self
 
@@ -180,7 +198,7 @@ class Map:
 
 class UserMap(Map):
     '''
-        用户地图类\ 
+        用户地图类
         parameters: `user` - `User`类或者子类的实例
     '''
 
@@ -290,7 +308,7 @@ class UserMap(Map):
                 if self.require_type in ['pack', 'single']:
                     item = ItemFactory(self.c).get_item(self.require_type)
                     item.item_id = self.require_id
-                    item.select(self.user)
+                    item.select_user_item(self.user)
                     if not item.amount:
                         self.is_locked = True
 
@@ -395,7 +413,8 @@ class Stamina:
 
 class UserStamina(Stamina):
     '''
-        用户体力类\ 
+        用户体力类
+
         parameter: `user` - `User`类或子类的实例
     '''
 
@@ -421,8 +440,9 @@ class UserStamina(Stamina):
 
 class WorldPlay:
     '''
-        世界模式打歌类，处理特殊角色技能，联动UserMap和UserPlay\ 
+        世界模式打歌类，处理特殊角色技能，联动UserMap和UserPlay
-        parameter: `user` - `UserOnline`类或子类的实例\ 
+
+        parameter: `user` - `UserOnline`类或子类的实例
         'user_play` - `UserPlay`类的实例
     '''
 
@@ -436,8 +456,9 @@ class WorldPlay:
         self.step_value: float = None
 
         self.prog_tempest: float = None
-        self.overdrive_extra: float = None
         self.character_bonus_progress: float = None
+        self.prog_skill_increase: float = None
+        self.over_skill_increase: float = None
 
     def to_dict(self) -> dict:
         arcmap: 'UserMap' = self.user.current_map
@@ -465,14 +486,17 @@ class WorldPlay:
             },
             "current_stamina": self.user.stamina.stamina,
             "max_stamina_ts": self.user.stamina.max_stamina_ts,
-            'world_mode_locked_end_ts': self.user.world_mode_locked_end_ts
+            'world_mode_locked_end_ts': self.user.world_mode_locked_end_ts,
+            'beyond_boost_gauge': self.user.beyond_boost_gauge
         }
 
-        if self.overdrive_extra is not None:
+        if self.over_skill_increase is not None:
-            r['char_stats']['overdrive'] += self.overdrive_extra
+            r['char_stats']['over_skill_increase'] = self.over_skill_increase
+        if self.prog_skill_increase is not None:
+            r['char_stats']['prog_skill_increase'] = self.prog_skill_increase
 
         if self.prog_tempest is not None:
-            r['char_stats']['prog'] += self.prog_tempest
+            r['char_stats']['prog'] += self.prog_tempest  # 没试过要不要这样
             r['char_stats']['prog_tempest'] = self.prog_tempest
 
         if self.character_bonus_progress is not None:
@@ -492,16 +516,45 @@ class WorldPlay:
             r['fragment_multiply'] = self.user_play.fragment_multiply
         if self.user_play.prog_boost_multiply != 0:
             r['prog_boost_multiply'] = self.user_play.prog_boost_multiply
+        if self.user_play.beyond_boost_gauge_usage != 0:
+            r['beyond_boost_gauge_usage'] = self.user_play.beyond_boost_gauge_usage
 
         return r
 
+    @property
+    def beyond_boost_gauge_addition(self) -> float:
+        # guessed by Lost-MSth
+        return 2.45 * self.user_play.rating ** 0.5 + 27
+
     @property
     def step_times(self) -> float:
-        return self.user_play.stamina_multiply * self.user_play.fragment_multiply / 100 * (self.user_play.prog_boost_multiply+100) / 100
+        prog_boost_multiply = self.user_play.prog_boost_multiply + 100
+        beyond_boost_times = 1
+
+        if self.user_play.beyond_gauge == 1:
+            if prog_boost_multiply > 100:
+                prog_boost_multiply -= 100
+            if self.user_play.beyond_boost_gauge_usage == 100:
+                beyond_boost_times = 2
+            elif self.user_play.beyond_boost_gauge_usage == 200:
+                beyond_boost_times = 3
+
+        return self.user_play.stamina_multiply * self.user_play.fragment_multiply / 100 * prog_boost_multiply / 100 * beyond_boost_times
 
     @property
     def exp_times(self) -> float:
-        return self.user_play.stamina_multiply * (self.user_play.prog_boost_multiply+100) / 100
+        prog_boost_multiply = self.user_play.prog_boost_multiply + 100
+        beyond_boost_times = 1
+
+        if self.user_play.beyond_gauge == 1:
+            if prog_boost_multiply > 100:
+                prog_boost_multiply -= 100
+            if self.user_play.beyond_boost_gauge_usage == 100:
+                beyond_boost_times = 2
+            elif self.user_play.beyond_boost_gauge_usage == 200:
+                beyond_boost_times = 3
+
+        return self.user_play.stamina_multiply * prog_boost_multiply / 100 * beyond_boost_times
 
     def get_step(self) -> None:
         if self.user_play.beyond_gauge == 0:
@@ -510,6 +563,8 @@ class WorldPlay:
                 self.character_used.level)
             if self.prog_tempest:
                 prog += self.prog_tempest
+            if self.prog_skill_increase:
+                prog += self.prog_skill_increase
 
             self.step_value = self.base_step_value * prog / 50 * self.step_times
         else:
@@ -528,8 +583,8 @@ class WorldPlay:
 
             overdrive = self.character_used.overdrive.get_value(
                 self.character_used.level)
-            if self.overdrive_extra:
+            if self.over_skill_increase:
-                overdrive += self.overdrive_extra
+                overdrive += self.over_skill_increase
 
             self.step_value = self.base_step_value * overdrive / \
                 50 * self.step_times * affinity_multiplier
@@ -542,6 +597,20 @@ class WorldPlay:
         self.user_play.clear_play_state()
         self.user.select_user_about_world_play()
 
+        if self.user_play.beyond_gauge == 0:
+            # 更新byd大招蓄力条
+            self.user.beyond_boost_gauge += self.beyond_boost_gauge_addition
+            self.user.beyond_boost_gauge = min(
+                self.user.beyond_boost_gauge, 200)
+            self.user.update_user_one_column(
+                'beyond_boost_gauge', self.user.beyond_boost_gauge)
+        elif self.user_play.beyond_boost_gauge_usage != 0 and self.user_play.beyond_boost_gauge_usage <= self.user.beyond_boost_gauge:
+            self.user.beyond_boost_gauge -= self.user_play.beyond_boost_gauge_usage
+            if abs(self.user.beyond_boost_gauge) <= 1e-5:
+                self.user.beyond_boost_gauge = 0
+            self.user.update_user_one_column(
+                'beyond_boost_gauge', self.user.beyond_boost_gauge)
+
         self.character_used = Character()
 
         self.user.character.select_character_info()
@@ -587,9 +656,15 @@ class WorldPlay:
         if self.user_play.beyond_gauge == 0:
             if self.character_used.character_id == 35 and self.character_used.skill_id_displayed:
                 self._special_tempest()
+            elif self.character_used.skill_id_displayed == 'ilith_awakened_skill':
+                self._ilith_awakened_skill()
+            elif self.character_used.skill_id_displayed == 'skill_mithra':
+                self._skill_mithra()
         else:
             if self.character_used.skill_id_displayed == 'skill_vita':
                 self._skill_vita()
+        if self.character_used.skill_id_displayed == 'skill_mika':
+            self._skill_mika()
 
     def after_climb(self) -> None:
         factory_dict = {'eto_uncap': self._eto_uncap, 'ayu_uncap': self._ayu_uncap,
@@ -613,12 +688,12 @@ class WorldPlay:
 
     def _skill_vita(self) -> None:
         '''
-            vita技能，overdrive随回忆率提升，提升量最多为10\ 
+            vita技能，overdrive随回忆率提升，提升量最多为10
             此处采用线性函数
         '''
-        self.overdrive_extra = 0
+        self.over_skill_increase = 0
         if 0 < self.user_play.health <= 100:
-            self.overdrive_extra = self.user_play.health / 10
+            self.over_skill_increase = self.user_play.health / 10
 
     def _eto_uncap(self) -> None:
         '''eto觉醒技能，获得残片奖励时世界模式进度加7'''
@@ -674,6 +749,30 @@ class WorldPlay:
         '''
         x: 'Step' = self.user.current_map.steps_for_climbing[0]
         if ('randomsong' in x.step_type or 'speedlimit' in x.step_type) and self.user_play.song_grade < 5:
-            self.character_bonus_progress = -self.step_value / 2 / self.step_times
+            self.character_bonus_progress = -1 * self.step_value / 2 / self.step_times
             self.step_value = self.step_value / 2
             self.user.current_map.reclimb(self.step_value)
+
+    def _ilith_awakened_skill(self) -> None:
+        '''
+        ilith 觉醒技能，曲目通关时步数+6，wiki 说是 prog 值+6
+        '''
+        if self.user_play.health > 0:
+            self.prog_skill_increase = 6
+
+    def _skill_mika(self) -> None:
+        '''
+        mika 技能，通关特定曲目能力值翻倍
+        '''
+        if self.user_play.song.song_id in Constant.SKILL_MIKA_SONGS and self.user_play.clear_type != 0:
+            self.over_skill_increase = self.character_used.overdrive.get_value(
+                self.character_used.level)
+            self.prog_skill_increase = self.character_used.prog.get_value(
+                self.character_used.level)
+
+    def _skill_mithra(self) -> None:
+        '''
+        mithra 技能，每 150 combo 增加世界模式进度+1，直接理解成 prog 值增加
+        '''
+        if self.user_play.combo_interval_bonus:
+            self.prog_skill_increase = self.user_play.combo_interval_bonus

latest version/database/init/arc_data.py

@@ -1,45 +1,45 @@
 class InitData:
     char = ['hikari', 'tairitsu', 'kou', 'sapphire', 'lethe', 'hikari&tairitsu(reunion)', 'Tairitsu(Axium)', 'Tairitsu(Grievous Lady)', 'stella', 'Hikari & Fisica', 'ilith', 'eto', 'luna', 'shirabe', 'Hikari(Zero)', 'Hikari(Fracture)', 'Hikari(Summer)', 'Tairitsu(Summer)', 'Tairitsu & Trin',
-            'ayu', 'Eto & Luna', 'yume', 'Seine & Hikari', 'saya', 'Tairitsu & Chuni Penguin', 'Chuni Penguin', 'haruna', 'nono', 'MTA-XXX', 'MDA-21', 'kanae', 'Hikari(Fantasia)', 'Tairitsu(Sonata)', 'sia', 'DORO*C', 'Tairitsu(Tempest)', 'brillante', 'Ilith(Summer)', 'etude', 'Alice & Tenniel', 'Luna & Mia', 'areus', 'seele', 'isabelle', 'mir', 'lagrange', 'linka', 'nami', 'Saya & Elizabeth', 'lily', 'kanae(midsummer)', 'alice&tenniel(minuet)', 'tairitsu(elegy)', 'marija', 'vita', 'hikari(fatalis)', 'saki', 'setsuna', 'amane']
+            'ayu', 'Eto & Luna', 'yume', 'Seine & Hikari', 'saya', 'Tairitsu & Chuni Penguin', 'Chuni Penguin', 'haruna', 'nono', 'MTA-XXX', 'MDA-21', 'kanae', 'Hikari(Fantasia)', 'Tairitsu(Sonata)', 'sia', 'DORO*C', 'Tairitsu(Tempest)', 'brillante', 'Ilith(Summer)', 'etude', 'Alice & Tenniel', 'Luna & Mia', 'areus', 'seele', 'isabelle', 'mir', 'lagrange', 'linka', 'nami', 'Saya & Elizabeth', 'lily', 'kanae(midsummer)', 'alice&tenniel(minuet)', 'tairitsu(elegy)', 'marija', 'vita', 'hikari(fatalis)', 'saki', 'setsuna', 'amane', 'kou(winter)', 'lagrange(aria)', 'lethe(apophenia)', 'shama(UNiVERSE)', 'milk(UNiVERSE)', 'shikoku', 'mika yurisaki', 'Mithra Tercera', 'Toa Kozukata']
 
     skill_id = ['gauge_easy', '', '', '', 'note_mirror', 'skill_reunion', '', 'gauge_hard', 'frag_plus_10_pack_stellights', 'gauge_easy|frag_plus_15_pst&prs', 'gauge_hard|fail_frag_minus_100', 'frag_plus_5_side_light', 'visual_hide_hp', 'frag_plus_5_side_conflict', 'challenge_fullcombo_0gauge', 'gauge_overflow', 'gauge_easy|note_mirror', 'note_mirror', 'visual_tomato_pack_tonesphere',
-                'frag_rng_ayu', 'gaugestart_30|gaugegain_70', 'combo_100-frag_1', 'audio_gcemptyhit_pack_groovecoaster', 'gauge_saya', 'gauge_chuni', 'kantandeshou', 'gauge_haruna', 'frags_nono', 'gauge_pandora', 'gauge_regulus', 'omatsuri_daynight', '', '', 'sometimes(note_mirror|frag_plus_5)', 'scoreclear_aa|visual_scoregauge', 'gauge_tempest', 'gauge_hard', 'gauge_ilith_summer', '', 'note_mirror|visual_hide_far', 'frags_ongeki', 'gauge_areus', 'gauge_seele', 'gauge_isabelle', 'gauge_exhaustion', 'skill_lagrange', 'gauge_safe_10', 'frags_nami', 'skill_elizabeth', 'skill_lily', 'skill_kanae_midsummer', '', '', 'visual_ghost_skynotes', 'skill_vita', 'skill_fatalis', 'frags_ongeki_slash', 'frags_ongeki_hard', 'skill_amane']
+                'frag_rng_ayu', 'gaugestart_30|gaugegain_70', 'combo_100-frag_1', 'audio_gcemptyhit_pack_groovecoaster', 'gauge_saya', 'gauge_chuni', 'kantandeshou', 'gauge_haruna', 'frags_nono', 'gauge_pandora', 'gauge_regulus', 'omatsuri_daynight', '', '', 'sometimes(note_mirror|frag_plus_5)', 'scoreclear_aa|visual_scoregauge', 'gauge_tempest', 'gauge_hard', 'gauge_ilith_summer', '', 'note_mirror|visual_hide_far', 'frags_ongeki', 'gauge_areus', 'gauge_seele', 'gauge_isabelle', 'gauge_exhaustion', 'skill_lagrange', 'gauge_safe_10', 'frags_nami', 'skill_elizabeth', 'skill_lily', 'skill_kanae_midsummer', '', '', 'visual_ghost_skynotes', 'skill_vita', 'skill_fatalis', 'frags_ongeki_slash', 'frags_ongeki_hard', 'skill_amane', 'skill_kou_winter', '', 'gauge_hard|note_mirror', 'skill_shama', 'skill_milk', 'skill_shikoku', 'skill_mika', 'skill_mithra', 'skill_toa']
 
-    skill_id_uncap = ['', '', 'frags_kou', '', 'visual_ink', '', '', '', '', '', '', 'eto_uncap', 'luna_uncap', 'shirabe_entry_fee',
+    skill_id_uncap = ['', '', 'frags_kou', '', 'visual_ink', '', '', '', '', '', 'ilith_awakened_skill', 'eto_uncap', 'luna_uncap', 'shirabe_entry_fee',
-                      '', '', '', '', '', 'ayu_uncap', '', 'frags_yume', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '']
+                      '', '', '', '', '', 'ayu_uncap', '', 'frags_yume', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '']
 
     skill_unlock_level = [0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0,
-                          0, 0, 0, 8, 0, 14, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0]
+                          0, 0, 0, 8, 0, 14, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 
     frag1 = [55, 55, 60, 50, 47, 79, 47, 57, 41, 22, 50, 54, 60, 56, 78, 42, 41, 61, 52, 50, 52, 32,
-             42, 55, 45, 58, 43, 0.5, 68, 50, 62, 45, 45, 52, 44, 27, 59, 0, 45, 50, 50, 47, 47, 61, 43, 42, 38, 25, 58, 50, 61, 45, 45, 38, 34, 27, 18, 56, 47]
+             42, 55, 45, 58, 43, 0.5, 68, 50, 62, 45, 45, 52, 44, 27, 59, 0, 45, 50, 50, 47, 47, 61, 43, 42, 38, 25, 58, 50, 61, 45, 45, 38, 34, 27, 18, 56, 47, 30, 45, 57, 56, 47, 33, 26, 29, 66]
 
     prog1 = [35, 55, 47, 50, 60, 70, 60, 70, 58, 45, 70, 45, 42, 46, 61, 67, 49, 44, 28, 45, 24, 46, 52,
-             59, 62, 33, 58, 25, 63, 69, 50, 45, 45, 51, 34, 70, 62, 70, 45, 32, 32, 61, 47, 47, 37, 42, 50, 50, 45, 41, 61, 45, 45, 58, 50, 130, 18, 57, 55]
+             59, 62, 33, 58, 25, 63, 69, 50, 45, 45, 51, 34, 70, 62, 70, 45, 32, 32, 61, 47, 47, 37, 42, 50, 50, 45, 41, 61, 45, 45, 58, 50, 130, 18, 57, 55, 50, 45, 70, 37.5, 29, 44, 26, 26, 35]
 
     overdrive1 = [35, 55, 25, 50, 47, 70, 72, 57, 41, 7, 10, 32, 65, 31, 61, 53, 31, 47, 38, 12, 39, 18,
-                  48, 65, 45, 55, 44, 25, 46, 44, 33, 45, 45, 37, 25, 27, 50, 20, 45, 63, 21, 47, 61, 47, 65, 80, 38, 30, 49, 15, 34, 45, 45, 38, 67, 120, 44, 33, 55]
+                  48, 65, 45, 55, 44, 25, 46, 44, 33, 45, 45, 37, 25, 27, 50, 20, 45, 63, 21, 47, 61, 47, 65, 80, 38, 30, 49, 15, 34, 45, 45, 38, 67, 120, 44, 33, 55, 50, 45, 57, 31, 29, 65, 26, 29, 42.5]
 
     frag20 = [78, 80, 90, 75, 70, 79, 70, 79, 65, 40, 50, 80, 90, 82, 0, 61, 67, 92, 85, 50, 86, 52,
-              65, 85, 67, 88, 64, 0.5, 95, 70, 95, 50, 80, 87, 71, 50, 85, 0, 80, 75, 50, 70, 70, 90, 65, 80, 61, 50, 68, 60, 90, 67, 50, 60, 51, 50, 35, 85, 47]
+              65, 85, 67, 88, 64, 0.5, 95, 70, 95, 50, 80, 87, 71, 50, 85, 0, 80, 75, 50, 70, 70, 90, 65, 80, 61, 50, 68, 60, 90, 67, 50, 60, 51, 50, 35, 85, 47, 50, 75, 80, 90, 80, 50, 51, 54, 100]
 
     prog20 = [61, 80, 70, 75, 90, 70, 90, 102, 84, 78, 105, 67, 63, 68, 0, 99, 80, 66, 46, 83, 40, 73,
-              80, 90, 93, 50, 86, 78, 89, 98, 75, 80, 50, 64, 55, 100, 90, 110, 80, 50, 74, 90, 70, 70, 56, 80, 79, 55, 65, 59, 90, 50, 90, 90, 75, 210, 35, 86, 92]
+              80, 90, 93, 50, 86, 78, 89, 98, 75, 80, 50, 64, 55, 100, 90, 110, 80, 50, 74, 90, 70, 70, 56, 80, 79, 55, 65, 59, 90, 50, 90, 90, 75, 210, 35, 86, 92, 80, 75, 100, 60, 50, 68, 51, 50, 53]
 
     overdrive20 = [61, 80, 47, 75, 70, 70, 95, 79, 65, 31, 50, 59, 90, 58, 0, 78, 50, 70, 62, 49, 64,
-                   46, 73, 95, 67, 84, 70, 78, 69, 70, 50, 80, 80, 63, 25, 50, 72, 55, 50, 95, 55, 70, 90, 70, 99, 80, 61, 40, 69, 62, 51, 90, 67, 60, 100, 200, 85, 50, 92]
+                   46, 73, 95, 67, 84, 70, 78, 69, 70, 50, 80, 80, 63, 25, 50, 72, 55, 50, 95, 55, 70, 90, 70, 99, 80, 61, 40, 69, 62, 51, 90, 67, 60, 100, 200, 85, 50, 92, 50, 75, 80, 49.5, 50, 100, 51, 54, 65.5]
 
     frag30 = [88, 90, 100, 75, 80, 89, 70, 79, 65, 40, 50, 90, 100, 92, 0, 61, 67, 92, 85, 50, 86, 62,
-              65, 85, 67, 88, 74, 0.5, 105, 80, 95, 50, 80, 87, 71, 50, 95, 0, 80, 75, 50, 70, 80, 100, 65, 80, 61, 50, 68, 60, 90, 67, 50, 60, 51, 50, 35, 85, 47]
+              65, 85, 67, 88, 74, 0.5, 105, 80, 95, 50, 80, 87, 71, 50, 95, 0, 80, 75, 50, 70, 80, 100, 65, 80, 61, 50, 68, 60, 90, 67, 50, 60, 51, 50, 35, 85, 47, 50, 75, 80, 90, 80, 50, 51, 64, 100]
 
-    prog30 = [71, 90, 80, 75, 100, 80, 90, 102, 84, 78, 105, 77, 73, 78, 0, 99, 80, 66, 46, 93, 40, 83,
+    prog30 = [71, 90, 80, 75, 100, 80, 90, 102, 84, 78, 110, 77, 73, 78, 0, 99, 80, 66, 46, 93, 40, 83,
-              80, 90, 93, 50, 96, 88, 99, 108, 75, 80, 50, 64, 55, 100, 100, 110, 80, 50, 74, 90, 80, 80, 56, 80, 79, 55, 65, 59, 90, 50, 90, 90, 75, 210, 35, 86, 92]
+              80, 90, 93, 50, 96, 88, 99, 108, 75, 80, 50, 64, 55, 100, 100, 110, 80, 50, 74, 90, 80, 80, 56, 80, 79, 55, 65, 59, 90, 50, 90, 90, 75, 210, 35, 86, 92, 80, 75, 100, 60, 50, 68, 51, 60, 53]
 
     overdrive30 = [71, 90, 57, 75, 80, 80, 95, 79, 65, 31, 50, 69, 100, 68, 0, 78, 50, 70, 62, 59, 64,
-                   56, 73, 95, 67, 84, 80, 88, 79, 80, 50, 80, 80, 63, 25, 50, 82, 55, 50, 95, 55, 70, 100, 80, 99, 80, 61, 40, 69, 62, 51, 90, 67, 60, 100, 200, 85, 50, 92]
+                   56, 73, 95, 67, 84, 80, 88, 79, 80, 50, 80, 80, 63, 25, 50, 82, 55, 50, 95, 55, 70, 100, 80, 99, 80, 61, 40, 69, 62, 51, 90, 67, 60, 100, 200, 85, 50, 92, 50, 75, 80, 49.5, 50, 100, 51, 64, 65.5]
 
     char_type = [1, 0, 0, 0, 0, 0, 0, 2, 0, 1, 2, 0, 0, 0, 2, 3, 1, 0, 0, 0, 1,
-                 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 2, 2, 2, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 2, 2]
+                 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 2, 2, 2, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 2, 2, 0, 0, 2, 0, 0, 2, 0, 2, 2]
 
     char_core = {
         0: [{'core_id': 'core_hollow', 'amount': 25}, {'core_id': 'core_desolate', 'amount': 5}],
@@ -57,14 +57,16 @@ class InitData:
         43: [{'core_id': 'core_chunithm', 'amount': 15}],
         11: [{'core_id': 'core_binary', 'amount': 25}, {'core_id': 'core_hollow', 'amount': 5}],
         12: [{'core_id': 'core_binary', 'amount': 25}, {'core_id': 'core_desolate', 'amount': 5}],
-        19: [{'core_id': 'core_colorful', 'amount': 30}]
+        19: [{'core_id': 'core_colorful', 'amount': 30}],
+        10: [{'core_id': 'core_umbral', 'amount': 30}],
+        66: [{'core_id': 'core_chunithm', 'amount': 15}]
     }
 
     cores = ['core_hollow', 'core_desolate', 'core_chunithm', 'core_crimson',
-             'core_ambivalent', 'core_scarlet', 'core_groove', 'core_generic', 'core_binary', 'core_colorful', 'core_course_skip_purchase']
+             'core_ambivalent', 'core_scarlet', 'core_groove', 'core_generic', 'core_binary', 'core_colorful', 'core_course_skip_purchase', 'core_umbral']
 
     world_songs = ["babaroque", "shadesoflight", "kanagawa", "lucifer", "anokumene", "ignotus", "rabbitintheblackroom", "qualia", "redandblue", "bookmaker", "darakunosono", "espebranch", "blacklotus", "givemeanightmare", "vividtheory", "onefr", "gekka", "vexaria3", "infinityheaven3", "fairytale3", "goodtek3", "suomi", "rugie", "faintlight", "harutopia", "goodtek", "dreaminattraction", "syro", "diode", "freefall", "grimheart", "blaster",
-                   "cyberneciacatharsis", "monochromeprincess", "revixy", "vector", "supernova", "nhelv", "purgatorium3", "dement3", "crossover", "guardina", "axiumcrisis", "worldvanquisher", "sheriruth", "pragmatism", "gloryroad", "etherstrike", "corpssansorganes", "lostdesire", "blrink", "essenceoftwilight", "lapis", "solitarydream", "lumia3", "purpleverse", "moonheart3", "glow", "enchantedlove", "take", "lifeispiano", "vandalism", "nexttoyou3", "lostcivilization3", "turbocharger", "bookmaker3", "laqryma3", "kyogenkigo", "hivemind", "seclusion", "quonwacca3", "bluecomet", "energysynergymatrix", "gengaozo", "lastendconductor3", "antithese3", "qualia3", "kanagawa3", "heavensdoor3", "pragmatism3", "nulctrl", "avril", "ddd", "merlin3", "omakeno3", "nekonote", "sanskia", 'altair', 'mukishitsu', 'trapcrow', 'redandblue3', 'ignotus3', 'singularity3', 'dropdead3', 'arcahv', 'freefall3']
+                   "cyberneciacatharsis", "monochromeprincess", "revixy", "vector", "supernova", "nhelv", "purgatorium3", "dement3", "crossover", "guardina", "axiumcrisis", "worldvanquisher", "sheriruth", "pragmatism", "gloryroad", "etherstrike", "corpssansorganes", "lostdesire", "blrink", "essenceoftwilight", "lapis", "solitarydream", "lumia3", "purpleverse", "moonheart3", "glow", "enchantedlove", "take", "lifeispiano", "vandalism", "nexttoyou3", "lostcivilization3", "turbocharger", "bookmaker3", "laqryma3", "kyogenkigo", "hivemind", "seclusion", "quonwacca3", "bluecomet", "energysynergymatrix", "gengaozo", "lastendconductor3", "antithese3", "qualia3", "kanagawa3", "heavensdoor3", "pragmatism3", "nulctrl", "avril", "ddd", "merlin3", "omakeno3", "nekonote", "sanskia", 'altair', 'mukishitsu', 'trapcrow', 'redandblue3', 'ignotus3', 'singularity3', 'dropdead3', 'arcahv', 'freefall3', 'partyvinyl3', 'tsukinimurakumo', 'mantis', 'worldfragments', 'astrawalkthrough', 'chronicle', 'trappola3', 'letsrock', 'shadesoflight3', 'teriqma3', 'impact3']
 
     world_unlocks = ["scenery_chap1", "scenery_chap2",
                      "scenery_chap3", "scenery_chap4", "scenery_chap5", "scenery_chap6", "scenery_chap7"]
@@ -75,12 +77,12 @@ class InitData:
     role_caption = ['系统', '管理员', '用户', '查询接口']
 
     power = ['system', 'select', 'select_me', 'change', 'change_me', 'grant',
-             'grant_inf', 'select_song_rank', 'select_song_info']
+             'grant_inf', 'select_song_rank', 'select_song_info', 'select_song_rank_top']
     power_caption = ['系统权限', '总体查询权限', '自我查询权限', '总体修改权限',
-                     '自我修改权限', '授权权限', '下级授权权限', '歌曲排行榜查询权限', '歌曲信息查询权限']
+                     '自我修改权限', '授权权限', '下级授权权限', '歌曲排行榜查询权限', '歌曲信息查询权限', '歌曲排行榜有限查询权限']
 
     role_power = {'system': power,
-                  'admin': ['select', 'select_me', 'change_me', 'grant_inf', 'select_song_rank', 'select_song_info'],
+                  'admin': ['select', 'select_me', 'change_me', 'grant_inf', 'select_song_rank_top', 'select_song_info'],
                   'user': ['select_me', 'change_me', 'select_song_rank', 'select_song_info'],
                   'selector': ['select']
                   }

latest version/database/init/log_tables.sql

@@ -0,0 +1,25 @@
+create table if not exists cache(key text primary key,
+value text,
+expire_time int
+);
+create table if not exists user_score(user_id int,
+song_id text,
+difficulty int,
+time_played int,
+score int,
+shiny_perfect_count int,
+perfect_count int,
+near_count int,
+miss_count int,
+health int,
+modifier int,
+clear_type int,
+rating real,
+primary key(user_id, song_id, difficulty, time_played)
+);
+
+create index if not exists user_score_1 on user_score (song_id, difficulty);
+create index if not exists user_score_2 on user_score (time_played);
+
+PRAGMA journal_mode = WAL;
+PRAGMA default_cache_size = 4000;

latest version/database/init/packs.json

@@ -327,11 +327,10 @@
 				"is_available": true
 			}
 		],
-		"price": 0,
+		"price": 700,
 		"orig_price": 700,
 		"discount_from": 1646784000000,
-		"discount_to": 1647388799000,
+		"discount_to": 1647388799000
-		"discount_reason": "extend"
 	},
 	{
 		"name": "alice",
@@ -595,6 +594,11 @@
 				"id": "finale",
 				"is_available": true
 			},
+			{
+				"type": "pack",
+				"id": "epilogue",
+				"is_available": true
+			},
 			{
 				"type": "core",
 				"amount": 5,
@@ -622,5 +626,61 @@
 		],
 		"orig_price": 500,
 		"price": 500
+	},
+	{
+		"name": "extend_2",
+		"items": [
+			{
+				"type": "pack",
+				"id": "extend_2",
+				"is_available": true
+			},
+			{
+				"type": "core",
+				"amount": 7,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
+		"orig_price": 700,
+		"price": 700,
+		"discount_from": 1646784000000,
+		"discount_to": 1647388799000
+	},
+	{
+		"name": "maimai_append_1",
+		"items": [
+			{
+				"type": "pack",
+				"id": "maimai_append_1",
+				"is_available": true
+			},
+			{
+				"type": "core",
+				"amount": 4,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
+		"orig_price": 400,
+		"price": 400
+	},
+	{
+		"name": "chunithm_append_2",
+		"items": [
+			{
+				"type": "pack",
+				"id": "chunithm_append_2",
+				"is_available": true
+			},
+			{
+				"type": "core",
+				"amount": 5,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
+		"orig_price": 500,
+		"price": 500
 	}
 ]

latest version/database/init/singles.json

@@ -28,8 +28,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "yourvoiceso",
@@ -48,8 +48,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "crosssoul",
@@ -68,8 +68,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "impurebird",
@@ -88,8 +88,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "auxesia",
@@ -128,8 +128,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "yozakurafubuki",
@@ -148,8 +148,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "surrender",
@@ -168,8 +168,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "metallicpunisher",
@@ -224,8 +224,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "callmyname",
@@ -244,8 +244,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "fallensquare",
@@ -264,8 +264,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "dropdead",
@@ -304,8 +304,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "astraltale",
@@ -324,8 +324,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "phantasia",
@@ -380,8 +380,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "dottodot",
@@ -400,8 +400,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "dreadnought",
@@ -420,8 +420,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "mirzam",
@@ -440,8 +440,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "heavenlycaress",
@@ -460,8 +460,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "filament",
@@ -480,8 +480,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "avantraze",
@@ -518,8 +518,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "saikyostronger",
@@ -556,8 +556,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "einherjar",
@@ -576,8 +576,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "laqryma",
@@ -596,8 +596,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "amygdata",
@@ -616,8 +616,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "altale",
@@ -636,8 +636,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "feelssoright",
@@ -656,8 +656,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "scarletcage",
@@ -712,8 +712,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "badtek",
@@ -732,8 +732,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "maliciousmischance",
@@ -788,8 +788,8 @@
 		],
 		"price": 100,
 		"orig_price": 100,
-		"discount_from": 1615248000000,
+		"discount_from": 1646784000000,
-		"discount_to": 1615852799000
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "xeraphinite",
@@ -807,7 +807,9 @@
 			}
 		],
 		"orig_price": 100,
-		"price": 100
+		"price": 100,
+		"discount_from": 1646784000000,
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "xanatos",
@@ -825,7 +827,9 @@
 			}
 		],
 		"price": 100,
-		"orig_price": 100
+		"orig_price": 100,
+		"discount_from": 1646784000000,
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "attraqtia",
@@ -843,7 +847,9 @@
 			}
 		],
 		"orig_price": 100,
-		"price": 100
+		"price": 100,
+		"discount_from": 1646784000000,
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "gimmedablood",
@@ -879,7 +885,9 @@
 			}
 		],
 		"orig_price": 100,
-		"price": 100
+		"price": 100,
+		"discount_from": 1646784000000,
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "theultimacy",
@@ -897,7 +905,9 @@
 			}
 		],
 		"orig_price": 100,
-		"price": 100
+		"price": 100,
+		"discount_from": 1646784000000,
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "rekkaresonanc",
@@ -945,7 +955,9 @@
 			}
 		],
 		"orig_price": 100,
-		"price": 100
+		"price": 100,
+		"discount_from": 1646784000000,
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "eveninginscarlet",
@@ -981,7 +993,9 @@
 			}
 		],
 		"orig_price": 100,
-		"price": 100
+		"price": 100,
+		"discount_from": 1646784000000,
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "goldenslaughterer",
@@ -999,7 +1013,9 @@
 			}
 		],
 		"orig_price": 100,
-		"price": 100
+		"price": 100,
+		"discount_from": 1646784000000,
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "redolentshape",
@@ -1017,7 +1033,9 @@
 			}
 		],
 		"orig_price": 100,
-		"price": 100
+		"price": 100,
+		"discount_from": 1646784000000,
+		"discount_to": 1647388799000
 	},
 	{
 		"name": "summerfireworks",
@@ -1056,29 +1074,11 @@
 		"price": 100
 	},
 	{
-		"name": "internetoverdose",
+		"name": "kissinglucifer",
 		"items": [
 			{
 				"type": "single",
-				"id": "internetoverdose",
+				"id": "kissinglucifer",
-				"is_available": true
-			},
-			{
-				"type": "core",
-				"amount": 1,
-				"id": "core_generic",
-				"is_available": true
-			}
-		],
-		"orig_price": 100,
-		"price": 100
-	},
-	{
-		"name": "macromod",
-		"items": [
-			{
-				"type": "single",
-				"id": "macromod",
 				"is_available": true
 			},
 			{
@@ -1110,11 +1110,11 @@
 		"price": 100
 	},
 	{
-		"name": "kissinglucifer",
+		"name": "macromod",
 		"items": [
 			{
 				"type": "single",
-				"id": "kissinglucifer",
+				"id": "macromod",
 				"is_available": true
 			},
 			{
@@ -1128,11 +1128,11 @@
 		"price": 100
 	},
 	{
-		"name": "headbonkache",
+		"name": "internetoverdose",
 		"items": [
 			{
 				"type": "single",
-				"id": "headbonkache",
+				"id": "internetoverdose",
 				"is_available": true
 			},
 			{
@@ -1163,6 +1163,24 @@
 		"orig_price": 100,
 		"price": 100
 	},
+	{
+		"name": "headbonkache",
+		"items": [
+			{
+				"type": "single",
+				"id": "headbonkache",
+				"is_available": true
+			},
+			{
+				"type": "core",
+				"amount": 1,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
+		"orig_price": 100,
+		"price": 100
+	},
 	{
 		"name": "picopicotranslation",
 		"items": [
@@ -1217,6 +1235,24 @@
 		"orig_price": 100,
 		"price": 100
 	},
+	{
+		"name": "cocorocosmetic",
+		"items": [
+			{
+				"type": "single",
+				"id": "cocorocosmetic",
+				"is_available": true
+			},
+			{
+				"type": "core",
+				"amount": 1,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
+		"orig_price": 100,
+		"price": 100
+	},
 	{
 		"name": "freemyself",
 		"items": [
@@ -1236,11 +1272,101 @@
 		"price": 100
 	},
 	{
-		"name": "cocorocosmetic",
+		"name": "capella",
 		"items": [
 			{
 				"type": "single",
-				"id": "cocorocosmetic",
+				"id": "capella",
+				"is_available": true
+			},
+			{
+				"type": "core",
+				"amount": 1,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
+		"orig_price": 100,
+		"price": 100
+	},
+	{
+		"name": "nullapophenia",
+		"items": [
+			{
+				"type": "single",
+				"id": "nullapophenia",
+				"is_available": true
+			},
+			{
+				"type": "core",
+				"amount": 1,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
+		"orig_price": 100,
+		"price": 100
+	},
+	{
+		"name": "hiirogekka",
+		"items": [
+			{
+				"type": "single",
+				"id": "hiirogekka",
+				"is_available": true
+			},
+			{
+				"type": "core",
+				"amount": 1,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
+		"orig_price": 100,
+		"price": 100
+	},
+	{
+		"name": "manicjeer",
+		"items": [
+			{
+				"type": "single",
+				"id": "manicjeer",
+				"is_available": true
+			},
+			{
+				"type": "core",
+				"amount": 1,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
+		"orig_price": 100,
+		"price": 100
+	},
+	{
+		"name": "crimsonthrone",
+		"items": [
+			{
+				"type": "single",
+				"id": "crimsonthrone",
+				"is_available": true
+			},
+			{
+				"type": "core",
+				"amount": 1,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
+		"orig_price": 100,
+		"price": 100
+	},
+	{
+		"name": "primitivelights",
+		"items": [
+			{
+				"type": "single",
+				"id": "primitivelights",
 				"is_available": true
 			},
 			{

latest version/database/init/tables.sql

@@ -33,7 +33,8 @@ ban_flag text,
 next_fragstam_ts int,
 max_stamina_ts int,
 stamina int,
-world_mode_locked_end_ts int
+world_mode_locked_end_ts int,
+beyond_boost_gauge real default 0
 );
 create table if not exists login(access_token text,
 user_id int,
@@ -182,7 +183,8 @@ course_score int,
 course_clear_type int,
 stamina_multiply int,
 fragment_multiply int,
-prog_boost_multiply int
+prog_boost_multiply int,
+beyond_boost_gauge_usage int
 );
 create table if not exists item(item_id text,
 type text,

latest version/linkplay_server/config.py

@@ -15,6 +15,8 @@ class Config:
     --------------------------------------------------
     '''
 
+    DEBUG = False
+
     TIME_LIMIT = 3600000
 
     COMMAND_INTERVAL = 1000000

latest version/linkplay_server/main.py

@@ -1,93 +1,18 @@
-import base64
+import binascii
 import logging
-import random
 import socketserver
 import threading
-import time
-from os import urandom
 
-# import binascii
 from .aes import decrypt, encrypt
 from .config import Config
-from .udp_class import Player, Room, bi
+from .store import Store, TCPRouter, clear_player, clear_room
+from .udp_class import bi
 from .udp_parser import CommandParser
 
-# token: {'key': key, 'room': Room, 'player_index': player_index, 'player_id': player_id}
-link_play_data = {}
-room_id_dict = {}  # 'room_id': Room
-room_code_dict = {}  # 'room_code': Room
-player_dict = {}  # 'player_id' : Player
-clean_timer = 0
-lock = threading.RLock()
-
 logging.basicConfig(format='[%(asctime)s] %(levelname)s in %(module)s: %(message)s',
                     level=logging.INFO)
 
 
-def random_room_code():
-    # 随机生成房间号
-    re = ''
-    for _ in range(4):
-        re += chr(random.randint(65, 90))
-    for _ in range(2):
-        re += str(random.randint(0, 9))
-
-    return re
-
-
-def unique_random(dataset, length=8, random_func=None):
-    '''无重复随机，且默认非0'''
-    if random_func is None:
-        x = bi(urandom(length))
-        while x in dataset or x == 0:
-            x = bi(urandom(length))
-    else:
-        x = random_func()
-        while x in dataset:
-            x = random_func()
-    return x
-
-
-def clear_player(token):
-    # 清除玩家信息和token
-    del player_dict[link_play_data[token]['player_id']]
-    del link_play_data[token]
-
-
-def clear_room(room):
-    # 清除房间信息
-    room_id = room.room_id
-    room_code = room.room_code
-    del room_id_dict[room_id]
-    del room_code_dict[room_code]
-    del room
-
-
-def memory_clean(now):
-    # 内存清理
-    with lock:
-        clean_room_list = []
-        clean_player_list = []
-        for token in link_play_data:
-            room = link_play_data[token]['room']
-            if now - room.timestamp >= Config.TIME_LIMIT:
-                clean_room_list.append(room.room_id)
-
-            if now - room.players[link_play_data[token]['player_index']].last_timestamp // 1000 >= Config.TIME_LIMIT:
-                clean_player_list.append(token)
-
-        for room_id in room_id_dict:
-            if now - room_id_dict[room_id].timestamp >= Config.TIME_LIMIT:
-                clean_room_list.append(room_id)
-
-        for room_id in clean_room_list:
-            if room_id in room_id_dict:
-                clear_room(room_id_dict[room_id])
-
-        for token in clean_player_list:
-            clear_player(token)
-
-
 class UDP_handler(socketserver.BaseRequestHandler):
     def handle(self):
         client_msg, server = self.request
@@ -96,32 +21,34 @@ class UDP_handler(socketserver.BaseRequestHandler):
             iv = client_msg[8:20]
             tag = client_msg[20:32]
             ciphertext = client_msg[32:]
-            if int.from_bytes(token, byteorder='little') in link_play_data:
+            if bi(token) not in Store.link_play_data:
-                user = link_play_data[bi(token)]
-            else:
                 return None
+            user = Store.link_play_data[bi(token)]
 
             plaintext = decrypt(user['key'], b'', iv, ciphertext, tag)
         except Exception as e:
             logging.error(e)
             return None
-        # print(binascii.b2a_hex(plaintext))
+
+        # if Config.DEBUG:
+        #     logging.info(
+        #         f'UDP-From-{self.client_address[0]}-{binascii.b2a_hex(plaintext)}')
 
         commands = CommandParser(
             user['room'], user['player_index']).get_commands(plaintext)
 
         if user['room'].players[user['player_index']].player_id == 0:
             clear_player(bi(token))
-            temp = []
+            if user['room'].player_num == 0:
-            for i in commands:
+                clear_room(user['room'])
-                if i[:3] == b'\x06\x16\x12':
+            commands = [i for i in commands if i[2] == 0x12]
-                    temp.append(i)
-            commands = temp
             # 处理不能正确被踢的问题
 
         for i in commands:
             iv, ciphertext, tag = encrypt(user['key'], i, b'')
-            # print(binascii.b2a_hex(i))
+            # if Config.DEBUG:
+            #     logging.info(
+            #         f'UDP-To-{self.client_address[0]}-{binascii.b2a_hex(i)}')
 
             server.sendto(token + iv + tag[:12] +
                           ciphertext, self.client_address)
@@ -132,126 +59,18 @@ class TCP_handler(socketserver.StreamRequestHandler):
         self.data = self.rfile.readline().strip()
 
         message = self.data.decode('utf-8')
-        # print(message)
+        if Config.DEBUG:
+            logging.info(f'TCP-From-{self.client_address[0]}-{message}')
         data = message.split('|')
         if data[0] != Config.AUTHENTICATION:
             self.wfile.write(b'No authentication')
-            logging.warning('TCP-%s-No authentication' %
+            logging.warning(f'TCP-{self.client_address[0]}-No authentication')
-                            self.client_address[0])
             return None
 
-        global clean_timer
+        r = TCPRouter(data[1:]).handle()
-        now = round(time.time() * 1000)
+        if Config.DEBUG:
-        if now - clean_timer >= Config.TIME_LIMIT:
+            logging.info(f'TCP-To-{self.client_address[0]}-{r}')
-            logging.info('Start cleaning memory...')
+        self.wfile.write(r.encode('utf-8'))
-            clean_timer = now
-            memory_clean(now)
-
-        self.wfile.write(data_swap(data[1:]).encode('utf-8'))
-
-
-def data_swap(data: list) -> str:
-    # data: list[str] = [command, ...]
-    if data[0] == '1':
-        # 开房
-        # data = ['1', name, song_unlock, ]
-        # song_unlock: base64 str
-        name = data[1]
-        song_unlock = base64.b64decode(data[2])
-
-        key = urandom(16)
-        with lock:
-            room_id = unique_random(room_id_dict)
-
-            room = Room()
-            room.room_id = room_id
-            room_id_dict[room_id] = room
-
-            player_id = unique_random(player_dict, 3)
-            player = Player()
-            player.player_id = player_id
-            player.set_player_name(name)
-            player_dict[player_id] = player
-
-            player.song_unlock = song_unlock
-            room.song_unlock = song_unlock
-            room.host_id = player_id
-            room.players[0] = player
-            room.player_num = 1
-
-            room_code = unique_random(
-                room_code_dict, random_func=random_room_code)
-            room.room_code = room_code
-            room_code_dict[room_code] = room
-
-            token = room_id
-            player.token = token
-
-            link_play_data[token] = {'key': key,
-                                     'room': room,
-                                     'player_index': 0,
-                                     'player_id': player_id}
-
-        logging.info('TCP-Create room `%s` by player `%s`' % (room_code, name))
-        return '|'.join([str(x) for x in (0, room_code, room_id, token, base64.b64encode(key).decode('utf-8'), player_id)])
-
-    elif data[0] == '2':
-        # 入房
-        # data = ['2', name, song_unlock, room_code]
-        # song_unlock: base64 str
-        room_code = data[3].upper()
-        with lock:
-            if room_code not in room_code_dict:
-                # 房间号错误
-                return '1202'
-            room = room_code_dict[room_code]
-
-            if room.player_num == 4:
-                # 满人
-                return '1201'
-            elif room.state != 2:
-                # 无法加入
-                return '1205'
-
-        name = data[1]
-        song_unlock = base64.b64decode(data[2])
-
-        key = urandom(16)
-        with lock:
-            token = unique_random(link_play_data)
-            player_id = unique_random(player_dict, 3)
-
-            player = Player()
-            player.player_id = player_id
-            player.set_player_name(name)
-            player.token = token
-            player_dict[player_id] = player
-            player.song_unlock = song_unlock
-            room.update_song_unlock()
-            for i in range(4):
-                if room.players[i].player_id == 0:
-                    room.players[i] = player
-                    player_index = i
-                    break
-            link_play_data[token] = {'key': key,
-                                     'room': room,
-                                     'player_index': player_index,
-                                     'player_id': player_id}
-
-        logging.info('TCP-Player `%s` joins room `%s`' % (name, room_code))
-        return '|'.join([str(x) for x in (0, room_code, room.room_id, token, base64.b64encode(key).decode('utf-8'), player_id, base64.b64encode(room.song_unlock).decode('utf-8'))])
-
-    elif data[0] == '3':
-        # 房间信息更新
-        # data = ['3', token]
-        token = int(data[1])
-        with lock:
-            if token in link_play_data:
-                r = link_play_data[token]
-                logging.info('TCP-Room `%s` info update' % room_code)
-                return '|'.join([str(x) for x in (0, r['room'].room_code, r['room'].room_id, base64.b64encode(r['key']).decode('utf-8'), r['room'].players[r['player_index']].player_id, base64.b64encode(r['room'].song_unlock).decode('utf-8'))])
-            else:
-                return '108'
 
 
 def link_play(ip: str = Config.HOST, udp_port: int = Config.UDP_PORT, tcp_port: int = Config.TCP_PORT):

latest version/linkplay_server/store.py

@@ -0,0 +1,231 @@
+import logging
+from base64 import b64decode, b64encode
+from os import urandom
+from random import randint
+from threading import RLock
+from time import time
+
+from .config import Config
+from .udp_class import Player, Room, bi
+
+
+class Store:
+    # token: {'key': key, 'room': Room, 'player_index': player_index, 'player_id': player_id}
+    link_play_data = {}
+    room_id_dict = {}  # 'room_id': Room
+    room_code_dict = {}  # 'room_code': Room
+    player_dict = {}  # 'player_id' : Player
+
+    lock = RLock()
+
+
+def random_room_code():
+    re = ''
+    for _ in range(4):
+        re += chr(randint(65, 90))
+    for _ in range(2):
+        re += str(randint(0, 9))
+    return re
+
+
+def unique_random(dataset, length=8, random_func=None):
+    '''无重复随机，且默认非0，没处理可能的死循环'''
+    if random_func is None:
+        x = bi(urandom(length))
+        while x in dataset or x == 0:
+            x = bi(urandom(length))
+    else:
+        x = random_func()
+        while x in dataset:
+            x = random_func()
+    return x
+
+
+def clear_player(token):
+    # 清除玩家信息和token
+    del Store.player_dict[Store.link_play_data[token]['player_id']]
+    del Store.link_play_data[token]
+
+
+def clear_room(room):
+    # 清除房间信息
+    room_id = room.room_id
+    room_code = room.room_code
+    del Store.room_id_dict[room_id]
+    del Store.room_code_dict[room_code]
+    del room
+
+
+def memory_clean(now):
+    # 内存清理，应对玩家不正常退出
+    with Store.lock:
+        clean_room_list = []
+        clean_player_list = []
+        for token, v in Store.link_play_data.items():
+            room = v['room']
+            if now - room.timestamp >= Config.TIME_LIMIT:
+                clean_room_list.append(room.room_id)
+
+            if now - room.players[v['player_index']].last_timestamp // 1000 >= Config.TIME_LIMIT:
+                clean_player_list.append(token)
+
+        for room_id, v in Store.room_id_dict.items():
+            if now - v.timestamp >= Config.TIME_LIMIT:
+                clean_room_list.append(room_id)
+
+        for room_id in clean_room_list:
+            if room_id in Store.room_id_dict:
+                clear_room(Store.room_id_dict[room_id])
+
+        for token in clean_player_list:
+            clear_player(token)
+
+
+class TCPRouter:
+    clean_timer = 0
+    router = {
+        '0': 'debug',
+        '1': 'create_room',
+        '2': 'join_room',
+        '3': 'update_room',
+    }
+
+    def __init__(self, data: list):
+        self.data = data  # data: list[str] = [command, ...]
+
+    def debug(self):
+        if Config.DEBUG:
+            return eval(self.data[1])
+        return 'ok'
+
+    @staticmethod
+    def clean_check():
+        now = round(time() * 1000)
+        if now - TCPRouter.clean_timer >= Config.TIME_LIMIT:
+            logging.info('Start cleaning memory...')
+            TCPRouter.clean_timer = now
+            memory_clean(now)
+
+    def handle(self) -> str:
+        self.clean_check()
+        if self.data[0] not in self.router:
+            return None
+        r = getattr(self, self.router[self.data[0]])()
+        if isinstance(r, tuple):
+            return '|'.join(map(str, r))
+        return str(r)
+
+    @staticmethod
+    def generate_player(name: str) -> Player:
+        player_id = unique_random(Store.player_dict, 3)
+        player = Player()
+        player.player_id = player_id
+        player.set_player_name(name)
+
+        Store.player_dict[player_id] = player
+
+        return player
+
+    @staticmethod
+    def generate_room() -> Room:
+        room_id = unique_random(Store.room_id_dict)
+        room = Room()
+        room.room_id = room_id
+        room.timestamp = round(time() * 1000)
+        Store.room_id_dict[room_id] = room
+
+        room_code = unique_random(
+            Store.room_code_dict, random_func=random_room_code)
+        room.room_code = room_code
+        Store.room_code_dict[room_code] = room
+
+        return room
+
+    def create_room(self) -> tuple:
+        # 开房
+        # data = ['1', name, song_unlock, ]
+        # song_unlock: base64 str
+        name = self.data[1]
+        song_unlock = b64decode(self.data[2])
+
+        key = urandom(16)
+        with Store.lock:
+            room = self.generate_room()
+            player = self.generate_player(name)
+
+            player.song_unlock = song_unlock
+            room.song_unlock = song_unlock
+            room.host_id = player.player_id
+            room.players[0] = player
+
+            token = room.room_id
+            player.token = token
+
+            Store.link_play_data[token] = {
+                'key': key,
+                'room': room,
+                'player_index': 0,
+                'player_id': player.player_id
+            }
+
+        logging.info(f'TCP-Create room `{room.room_code}` by player `{name}`')
+        return (0, room.room_code, room.room_id, token, b64encode(key).decode('utf-8'), player.player_id)
+
+    def join_room(self) -> tuple:
+        # 入房
+        # data = ['2', name, song_unlock, room_code]
+        # song_unlock: base64 str
+        room_code = self.data[3].upper()
+        key = urandom(16)
+        name = self.data[1]
+        song_unlock = b64decode(self.data[2])
+
+        with Store.lock:
+            if room_code not in Store.room_code_dict:
+                # 房间号错误 / 房间不存在
+                return '1202'
+            room: Room = Store.room_code_dict[room_code]
+
+            player_num = room.player_num
+            if player_num == 4:
+                # 满人
+                return '1201'
+            if player_num == 0:
+                # 房间不存在
+                return '1202'
+            if room.state != 2:
+                # 无法加入
+                return '1205'
+
+            token = unique_random(Store.link_play_data)
+
+            player = self.generate_player(name)
+            player.token = token
+            player.song_unlock = song_unlock
+            room.update_song_unlock()
+            for i in range(4):
+                if room.players[i].player_id == 0:
+                    room.players[i] = player
+                    player_index = i
+                    break
+            Store.link_play_data[token] = {
+                'key': key,
+                'room': room,
+                'player_index': player_index,
+                'player_id': player.player_id
+            }
+
+        logging.info(f'TCP-Player `{name}` joins room `{room_code}`')
+        return (0, room_code, room.room_id, token, b64encode(key).decode('utf-8'), player.player_id, b64encode(room.song_unlock).decode('utf-8'))
+
+    def update_room(self) -> tuple:
+        # 房间信息更新
+        # data = ['3', token]
+        token = int(self.data[1])
+        with Store.lock:
+            if token not in Store.link_play_data:
+                return '108'
+            r = Store.link_play_data[token]
+            room = r['room']
+            logging.info(f'TCP-Room `{room.room_code}` info update')
+            return (0, room.room_code, room.room_id, b64encode(r['key']).decode('utf-8'), room.players[r['player_index']].player_id, b64encode(room.song_unlock).decode('utf-8'))

latest version/linkplay_server/udp_class.py

@@ -1,3 +1,5 @@
+from time import time
+
 from .config import Config
 
 
@@ -61,11 +63,10 @@ class Room:
         self.song_idx = 0xffff
         self.last_song_idx = 0xffff
 
-        self.song_unlock = b'\x00' * Config.LINK_PLAY_UNLOCK_LENGTH
+        self.song_unlock = b'\xFF' * Config.LINK_PLAY_UNLOCK_LENGTH
 
         self.host_id = 0
         self.players = [Player(), Player(), Player(), Player()]
-        self.player_num = 0
 
         self.interval = 1000
         self.times = 100
@@ -73,7 +74,33 @@ class Room:
         self.round_switch = 0
 
         self.command_queue = []
-        self.command_queue_length = 0
+
+    @property
+    def command_queue_length(self) -> int:
+        return len(self.command_queue)
+
+    @property
+    def player_num(self) -> int:
+        self.check_player_online()
+        return sum(i.player_id != 0 for i in self.players)
+
+    def check_player_online(self, now: int = None):
+        # 检测玩家是否被自动踢出房间 / 离线判断
+        now = round(time() * 1000000) if now is None else now
+        flag = False
+        player_index_list = []
+        for i, x in enumerate(self.players):
+            if x.player_id == 0 or x.last_timestamp == 0:
+                continue
+            if now - x.last_timestamp >= Config.PLAYER_TIMEOUT:
+                self.delete_player(i)
+                flag = True
+                player_index_list.append(i)
+            elif x.online == 1 and now - x.last_timestamp >= Config.PLAYER_PRE_TIMEOUT:
+                x.online = 0
+                player_index_list.append(i)
+
+        return flag, player_index_list
 
     def get_players_info(self):
         # 获取所有玩家信息
@@ -113,7 +140,6 @@ class Room:
 
     def delete_player(self, player_index: int):
         # 删除某个玩家
-        self.player_num -= 1
         if self.players[player_index].player_id == self.host_id:
             self.make_round()
 
@@ -138,7 +164,6 @@ class Room:
                     return False
 
             return True
-        else:
         return False
 
     def is_finish(self):

latest version/linkplay_server/udp_parser.py

@@ -6,31 +6,24 @@ from .udp_sender import CommandSender
 
 
 class CommandParser:
+    route = [None, 'command_01', 'command_02', 'command_03', 'command_04', 'command_05',
+             'command_06', 'command_07', 'command_08', 'command_09', 'command_0a', 'command_0b']
+
     def __init__(self, room: Room, player_index: int = 0) -> None:
         self.room = room
         self.player_index = player_index
+        self.s = CommandSender(self.room)
+        self.command: bytes = None
 
-    def get_commands(self, command):
+    def get_commands(self, command: bytes):
         self.command = command
-        l = {b'\x06\x16\x01': self.command_01,
+        r = getattr(self, self.route[self.command[2]])()
-             b'\x06\x16\x02': self.command_02,
-             b'\x06\x16\x03': self.command_03,
-             b'\x06\x16\x04': self.command_04,
-             b'\x06\x16\x05': self.command_05,
-             b'\x06\x16\x06': self.command_06,
-             b'\x06\x16\x07': self.command_07,
-             b'\x06\x16\x08': self.command_08,
-             b'\x06\x16\x09': self.command_09,
-             b'\x06\x16\x0a': self.command_0a,
-             b'\x06\x16\x0b': self.command_0b
-             }
-        r = l[command[:3]]()
 
         re = []
 
         flag_13 = False
         for i in range(max(bi(self.command[12:16]), self.room.players[self.player_index].start_command_num), self.room.command_queue_length):
-            if self.room.command_queue[i][:3] == b'\x06\x16\x13':
+            if self.room.command_queue[i][2] == 0x13:
                 if flag_13:
                     break
                 flag_13 = True
@@ -52,16 +45,11 @@ class CommandParser:
             if i.player_id == player_id and i.online == 1:
                 self.room.host_id = player_id
 
-        x = CommandSender(self.room)
+        self.s.random_code = self.command[16:24]
-        x.random_code = self.command[16:24]
+        self.room.command_queue.append(self.s.command_10())
-        self.room.command_queue_length += 1
-        self.room.command_queue.append(x.command_10())
-
-        return None
 
     def command_02(self):
-        x = CommandSender(self.room)
+        self.s.random_code = self.command[16:24]
-        x.random_code = self.command[16:24]
         song_idx = bi(self.command[24:26])
 
         flag = 2
@@ -69,17 +57,14 @@ class CommandParser:
             flag = 0
             self.room.state = 3
             self.room.song_idx = song_idx
-            self.room.command_queue_length += 1
+            self.room.command_queue.append(self.s.command_11())
-            self.room.command_queue.append(x.command_11())
+            self.room.command_queue.append(self.s.command_13())
-            self.room.command_queue_length += 1
-            self.room.command_queue.append(x.command_13())
 
-        return [x.command_0d(flag)]
+        return [self.s.command_0d(flag)]
 
     def command_03(self):
         # 尝试进入结算
-        x = CommandSender(self.room)
+        self.s.random_code = self.command[16:24]
-        x.random_code = self.command[16:24]
         player = self.room.players[self.player_index]
         player.score = bi(self.command[24:28])
         player.cleartype = self.command[28]
@@ -89,20 +74,15 @@ class CommandParser:
         player.last_timestamp -= Config.COMMAND_INTERVAL
         self.room.last_song_idx = self.room.song_idx
 
-        self.room.command_queue_length += 1
+        self.room.command_queue.append(self.s.command_12(self.player_index))
-        self.room.command_queue.append(x.command_12(self.player_index))
 
         if self.room.is_finish():
             self.room.make_finish()
-            self.room.command_queue_length += 1
+            self.room.command_queue.append(self.s.command_13())
-            self.room.command_queue.append(x.command_13())
-
-        return None
 
     def command_04(self):
         # 踢人
-        x = CommandSender(self.room)
+        self.s.random_code = self.command[16:24]
-        x.random_code = self.command[16:24]
         player_id = bi(self.command[24:32])
         flag = 2
         if self.room.players[self.player_index].player_id == self.room.host_id and player_id != self.room.host_id:
@@ -110,51 +90,38 @@ class CommandParser:
                 if self.room.players[i].player_id == player_id:
                     flag = 1
                     self.room.delete_player(i)
-                    self.room.command_queue_length += 1
+                    self.room.command_queue.append(self.s.command_12(i))
-                    self.room.command_queue.append(x.command_12(i))
                     self.room.update_song_unlock()
-                    self.room.command_queue_length += 1
+                    self.room.command_queue.append(self.s.command_14())
-                    self.room.command_queue.append(x.command_14())
                     break
 
-        return [x.command_0d(flag)]
+        return [self.s.command_0d(flag)]
 
     def command_05(self):
         pass
 
     def command_06(self):
-        x = CommandSender(self.room)
+        self.s.random_code = self.command[16:24]
-        x.random_code = self.command[16:24]
         self.room.state = 1
         self.room.song_idx = 0xffff
 
-        self.room.command_queue_length += 1
+        self.room.command_queue.append(self.s.command_13())
-        self.room.command_queue.append(x.command_13())
-        return None
 
     def command_07(self):
-        x = CommandSender(self.room)
+        self.s.random_code = self.command[16:24]
-        x.random_code = self.command[16:24]
         self.room.players[self.player_index].song_unlock = self.command[24:536]
         self.room.update_song_unlock()
 
-        self.room.command_queue_length += 1
+        self.room.command_queue.append(self.s.command_14())
-        self.room.command_queue.append(x.command_14())
-        return None
 
     def command_08(self):
         self.room.round_switch = bi(self.command[24:25])
-        x = CommandSender(self.room)
+        self.s.random_code = self.command[16:24]
-        x.random_code = self.command[16:24]
+        self.room.command_queue.append(self.s.command_13())
-        self.room.command_queue_length += 1
-        self.room.command_queue.append(x.command_13())
-
-        return None
 
     def command_09(self):
         re = []
-        x = CommandSender(self.room)
+        self.s.random_code = self.command[16:24]
-        x.random_code = self.command[16:24]
         player = self.room.players[self.player_index]
 
         if bi(self.command[12:16]) == 0:
@@ -162,29 +129,17 @@ class CommandParser:
             self.room.state = 1
             self.room.update_song_unlock()
             player.start_command_num = self.room.command_queue_length
-            self.room.command_queue_length += 1
+            self.room.command_queue.append(self.s.command_15())
-            self.room.command_queue.append(x.command_15())
         else:
-            if x.timestamp - player.last_timestamp >= Config.COMMAND_INTERVAL:
+            if self.s.timestamp - player.last_timestamp >= Config.COMMAND_INTERVAL:
-                re.append(x.command_0c())
+                re.append(self.s.command_0c())
-                player.last_timestamp = x.timestamp
+                player.last_timestamp = self.s.timestamp
 
-            flag_13 = False
             # 离线判断
-            for i in range(4):
+            flag_13, player_index_list = self.room.check_player_online(
-                if i != self.player_index:
+                self.s.timestamp)
-                    t = self.room.players[i]
+            for i in player_index_list:
-                    if t.player_id != 0:
+                self.room.command_queue.append(self.s.command_12(i))
-                        if t.last_timestamp != 0:
-                            if t.online == 1 and x.timestamp - t.last_timestamp >= Config.PLAYER_PRE_TIMEOUT:
-                                t.online = 0
-                                self.room.command_queue_length += 1
-                                self.room.command_queue.append(x.command_12(i))
-                            elif t.online == 0 and x.timestamp - t.last_timestamp >= Config.PLAYER_TIMEOUT:
-                                self.room.delete_player(i)
-                                self.room.command_queue_length += 1
-                                self.room.command_queue.append(x.command_12(i))
-                                flag_13 = True
 
             flag_11 = False
             flag_12 = False
@@ -234,7 +189,7 @@ class CommandParser:
                     # 将换房主时间提前到此刻
                     self.room.make_round()
 
-            if self.room.state == 4 or self.room.state == 5 or self.room.state == 6:
+            if self.room.state in (4, 5, 6):
                 timestamp = round(time.time() * 1000)
                 self.room.countdown -= timestamp - self.room.timestamp
                 self.room.timestamp = timestamp
@@ -263,10 +218,9 @@ class CommandParser:
                     self.room.countdown = 0xffffffff
                     flag_13 = True
 
-                if self.room.countdown <= 0:
+                self.room.countdown = self.room.countdown if self.room.countdown > 0 else 0
-                    self.room.countdown = 0
 
-            if self.room.state == 7 or self.room.state == 8:
+            if self.room.state in (7, 8):
                 if player.timer < bi(self.command[28:32]) or bi(self.command[28:32]) == 0 and player.timer != 0:
                     player.last_timer = player.timer
                     player.last_score = player.score
@@ -276,7 +230,7 @@ class CommandParser:
                 if player.timer != 0 or self.room.state != 8:
                     for i in self.room.players:
                         i.extra_command_queue.append(
-                            x.command_0e(self.player_index))
+                            self.s.command_0e(self.player_index))
 
                 if self.room.is_ready(8, 1):
                     flag_13 = True
@@ -293,14 +247,12 @@ class CommandParser:
                     flag_13 = True
 
             if flag_11:
-                self.room.command_queue_length += 1
+                self.room.command_queue.append(self.s.command_11())
-                self.room.command_queue.append(x.command_11())
             if flag_12:
-                self.room.command_queue_length += 1
+                self.room.command_queue.append(
-                self.room.command_queue.append(x.command_12(self.player_index))
+                    self.s.command_12(self.player_index))
             if flag_13:
-                self.room.command_queue_length += 1
+                self.room.command_queue.append(self.s.command_13())
-                self.room.command_queue.append(x.command_13())
 
         return re
 
@@ -308,28 +260,19 @@ class CommandParser:
         # 退出房间
         self.room.delete_player(self.player_index)
 
-        x = CommandSender(self.room)
+        self.room.command_queue.append(self.s.command_12(self.player_index))
-        self.room.command_queue_length += 1
-        self.room.command_queue.append(x.command_12(self.player_index))
 
-        if self.room.state == 3 or self.room.state == 2:
+        if self.room.state in (2, 3):
             self.room.state = 1
             self.room.song_idx = 0xffff
-        # self.room.command_queue_length += 1
+        # self.room.command_queue.append(self.s.command_11())
-        # self.room.command_queue.append(x.command_11())
+        self.room.command_queue.append(self.s.command_13())
-        self.room.command_queue_length += 1
+        self.room.command_queue.append(self.s.command_14())
-        self.room.command_queue.append(x.command_13())
-        self.room.command_queue_length += 1
-        self.room.command_queue.append(x.command_14())
-        return None
 
     def command_0b(self):
         # 推荐歌曲
         song_idx = bi(self.command[16:18])
-        x = CommandSender(self.room)
         for i in range(4):
             if self.player_index != i and self.room.players[i].online == 1:
                 self.room.players[i].extra_command_queue.append(
-                    x.command_0f(self.player_index, song_idx))
+                    self.s.command_0f(self.player_index, song_idx))
-
-        return None

latest version/linkplay_server/udp_sender.py

@@ -1,46 +1,64 @@
-import time
+from time import time
+
 from .udp_class import Room, b
 
 
 class CommandSender:
-    def __init__(self, room: Room = Room()) -> None:
+
+    PROTOCOL_NAME = b'\x06\x16'
+    PROTOCOL_VERSION = b'\x09'
+
+    def __init__(self, room: Room = None) -> None:
         self.room = room
-        self.timestamp = round(time.time() * 1000000)
+        self.timestamp = round(time() * 1000000)
 
         self.random_code = b'\x11\x11\x11\x11\x00\x00\x00\x00'
 
+    @staticmethod
+    def command_encode(t: tuple):
+        r = b''.join(t)
+        x = 16 - len(r) % 16
+        return r + b(x) * x
+
+    def command_prefix(self, command: bytes):
+        length = self.room.command_queue_length
+        if command >= b'\x10':
+            length += 1
+
+        return (self.PROTOCOL_NAME, command, self.PROTOCOL_VERSION, b(self.room.room_id, 8), b(length, 4))
+
     def command_0c(self):
-        return b'\x06\x16\x0c\x09' + b(self.room.room_id, 8) + b(self.room.command_queue_length, 4) + self.random_code + b(self.room.state) + b(self.room.countdown, 4) + b(self.timestamp, 8) + b'\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b'
+        return self.command_encode((*self.command_prefix(b'\x0c'), self.random_code, b(self.room.state), b(self.room.countdown, 4), b(self.timestamp, 8)))
 
     def command_0d(self, code: int):
-        return b'\x06\x16\x0d\x09' + b(self.room.room_id, 8) + b(self.room.command_queue_length, 4) + self.random_code + b(code) + b'\x07\x07\x07\x07\x07\x07\x07'
+        return self.command_encode((*self.command_prefix(b'\x0d'), self.random_code, b(code)))
 
     def command_0e(self, player_index: int):
         # 分数广播
         player = self.room.players[player_index]
-        return b'\x06\x16\x0e\x09' + b(self.room.room_id, 8) + b(self.room.command_queue_length, 4) + b(player.player_id, 8) + b(player.character_id) + b(player.is_uncapped) + b(player.difficulty) + b(player.score, 4) + b(player.timer, 4) + b(player.cleartype) + b(player.player_state) + b(player.download_percent) + b'\x01' + b(player.last_score, 4) + b(player.last_timer, 4) + b(player.online)
+        return self.command_encode((*self.command_prefix(b'\x0e'), b(player.player_id, 8), b(player.character_id), b(player.is_uncapped), b(player.difficulty), b(player.score, 4), b(player.timer, 4), b(player.cleartype), b(player.player_state), b(player.download_percent), b'\x01', b(player.last_score, 4), b(player.last_timer, 4), b(player.online)))
 
     def command_0f(self, player_index: int, song_idx: int):
         # 歌曲推荐
         player = self.room.players[player_index]
-        return b'\x06\x16\x0f\x09' + b(self.room.room_id, 8) + b(self.room.command_queue_length, 4) + b(player.player_id, 8) + b(song_idx, 2) + b'\x06\x06\x06\x06\x06\x06'
+        return self.command_encode((*self.command_prefix(b'\x0f'), b(player.player_id, 8), b(song_idx, 2)))
 
     def command_10(self):
         # 房主宣告
-        return b'\x06\x16\x10\x09' + b(self.room.room_id, 8) + b(self.room.command_queue_length, 4) + self.random_code + b(self.room.host_id, 8)
+        return self.command_encode((*self.command_prefix(b'\x10'), self.random_code, b(self.room.host_id, 8)))
 
     def command_11(self):
-        return b'\x06\x16\x11\x09' + b(self.room.room_id, 8) + b(self.room.command_queue_length, 4) + self.random_code + self.room.get_players_info() + b'\x08\x08\x08\x08\x08\x08\x08\x08'
+        return self.command_encode((*self.command_prefix(b'\x11'), self.random_code, self.room.get_players_info()))
 
     def command_12(self, player_index: int):
         player = self.room.players[player_index]
-        return b'\x06\x16\x12\x09' + b(self.room.room_id, 8) + b(self.room.command_queue_length, 4) + self.random_code + b(player_index) + b(player.player_id, 8) + b(player.character_id) + b(player.is_uncapped) + b(player.difficulty) + b(player.score, 4) + b(player.timer, 4) + b(player.cleartype) + b(player.player_state) + b(player.download_percent) + b(player.online)
+        return self.command_encode((*self.command_prefix(b'\x12'), self.random_code, b(player_index), b(player.player_id, 8), b(player.character_id), b(player.is_uncapped), b(player.difficulty), b(player.score, 4), b(player.timer, 4), b(player.cleartype), b(player.player_state), b(player.download_percent), b(player.online)))
 
     def command_13(self):
-        return b'\x06\x16\x13\x09' + b(self.room.room_id, 8) + b(self.room.command_queue_length, 4) + self.random_code + b(self.room.host_id, 8) + b(self.room.state) + b(self.room.countdown, 4) + b(self.timestamp, 8) + b(self.room.song_idx, 2) + b(self.room.interval, 2) + b(self.room.times, 7) + self.room.get_player_last_score() + b(self.room.last_song_idx, 2) + b(self.room.round_switch, 1) + b'\x01'
+        return self.command_encode((*self.command_prefix(b'\x13'), self.random_code, b(self.room.host_id, 8), b(self.room.state), b(self.room.countdown, 4), b(self.timestamp, 8), b(self.room.song_idx, 2), b(self.room.interval, 2), b(self.room.times, 7), self.room.get_player_last_score(), b(self.room.last_song_idx, 2), b(self.room.round_switch, 1)))
 
     def command_14(self):
-        return b'\x06\x16\x14\x09' + b(self.room.room_id, 8) + b(self.room.command_queue_length, 4) + self.random_code + self.room.song_unlock + b'\x08\x08\x08\x08\x08\x08\x08\x08'
+        return self.command_encode((*self.command_prefix(b'\x14'), self.random_code, self.room.song_unlock))
 
     def command_15(self):
-        return b'\x06\x16\x15\x09' + b(self.room.room_id, 8) + b(self.room.command_queue_length, 4) + self.room.get_players_info() + self.room.song_unlock + b(self.room.host_id, 8) + b(self.room.state) + b(self.room.countdown, 4) + b(self.timestamp, 8) + b(self.room.song_idx, 2) + b(self.room.interval, 2) + b(self.room.times, 7) + self.room.get_player_last_score() + b(self.room.last_song_idx, 2) + b(self.room.round_switch, 1) + b'\x09\x09\x09\x09\x09\x09\x09\x09\x09'
+        return self.command_encode((*self.command_prefix(b'\x15'), self.room.get_players_info(), self.room.song_unlock, b(self.room.host_id, 8), b(self.room.state), b(self.room.countdown, 4), b(self.timestamp, 8), b(self.room.song_idx, 2), b(self.room.interval, 2), b(self.room.times, 7), self.room.get_player_last_score(), b(self.room.last_song_idx, 2), b(self.room.round_switch, 1)))

latest version/main.py

@@ -27,7 +27,7 @@ import server
 import web.index
 import web.login
 from core.constant import Constant
-from core.download import (UserDownload, initialize_songfile)
+from core.download import UserDownload
 from core.error import ArcError, NoAccess, RateLimit
 from core.init import FileChecker
 from core.sql import Connect
@@ -105,6 +105,12 @@ if Config.DEPLOY_MODE == 'waitress':
             f'{request.remote_addr} - - {request.method} {request.path} {response.status_code}')
         return response
 
+# @app.before_request
+# def before_request():
+#     print(request.path)
+#     print(request.headers)
+#     print(request.data)
+
 
 def tcp_server_run():
     if Config.DEPLOY_MODE == 'gevent':
@@ -128,6 +134,18 @@ def tcp_server_run():
             app.run(Config.HOST, Config.PORT)
 
 
+def generate_log_file_dict(level: str, filename: str) -> dict:
+    return {
+        "class": "logging.handlers.RotatingFileHandler",
+        "maxBytes": 1024 * 1024,
+        "backupCount": 1,
+        "encoding": "utf-8",
+        "level": level,
+        "formatter": "default",
+        "filename": filename
+    }
+
+
 def main():
     log_dict = {
         'version': 1,
@@ -141,15 +159,7 @@ def main():
                 'stream': 'ext://flask.logging.wsgi_errors_stream',
                 'formatter': 'default'
             },
-            "error_file": {
+            "error_file": generate_log_file_dict('ERROR', './log/error.log')
-                "class": "logging.handlers.RotatingFileHandler",
-                "maxBytes": 1024 * 1024,
-                "backupCount": 1,
-                "encoding": "utf-8",
-                "level": "ERROR",
-                "formatter": "default",
-                "filename": "./log/error.log"
-            }
         },
         'formatters': {
             'default': {
@@ -159,50 +169,30 @@ def main():
     }
     if Config.ALLOW_INFO_LOG:
         log_dict['root']['handlers'].append('info_file')
-        log_dict['handlers']['info_file'] = {
+        log_dict['handlers']['info_file'] = generate_log_file_dict(
-            "class": "logging.handlers.RotatingFileHandler",
+            'INFO', './log/info.log')
-            "maxBytes": 1024 * 1024,
-            "backupCount": 1,
-            "encoding": "utf-8",
-            "level": "INFO",
-            "formatter": "default",
-            "filename": "./log/info.log"
-        }
     if Config.ALLOW_WARNING_LOG:
         log_dict['root']['handlers'].append('warning_file')
-        log_dict['handlers']['warning_file'] = {
+        log_dict['handlers']['warning_file'] = generate_log_file_dict(
-            "class": "logging.handlers.RotatingFileHandler",
+            'WARNING', './log/warning.log')
-            "maxBytes": 1024 * 1024,
-            "backupCount": 1,
-            "encoding": "utf-8",
-            "level": "WARNING",
-            "formatter": "default",
-            "filename": "./log/warning.log"
-        }
 
     dictConfig(log_dict)
 
-    if not FileChecker(app).check_before_run():
+    Connect.logger = app.logger
-        app.logger.error('Something wrong. The server will not run.')
+    if not FileChecker(app.logger).check_before_run():
+        app.logger.error('Some errors occurred. The server will not run.')
         input('Press ENTER key to exit.')
         sys.exit()
 
-    app.logger.info("Start to initialize song data...")
-    try:
-        initialize_songfile()
-        app.logger.info('Complete!')
-    except:
-        app.logger.warning('Initialization error!')
-
     if Config.LINKPLAY_HOST and Config.SET_LINKPLAY_SERVER_AS_SUB_PROCESS:
         from linkplay_server import link_play
         process = [Process(target=link_play, args=(
             Config.LINKPLAY_HOST, int(Config.LINKPLAY_UDP_PORT), int(Config.LINKPLAY_TCP_PORT)))]
         [p.start() for p in process]
-        app.logger.info("Link Play UDP server is running on " +
+        app.logger.info(
-                        Config.LINKPLAY_HOST + ':' + str(Config.LINKPLAY_UDP_PORT) + " ...")
+            f"Link Play UDP server is running on {Config.LINKPLAY_HOST}:{Config.LINKPLAY_UDP_PORT} ...")
-        app.logger.info("Link Play TCP server is running on " +
+        app.logger.info(
-                        Config.LINKPLAY_HOST + ':' + str(Config.LINKPLAY_TCP_PORT) + " ...")
+            f"Link Play TCP server is running on {Config.LINKPLAY_HOST}:{Config.LINKPLAY_TCP_PORT} ...")
         tcp_server_run()
         [p.join() for p in process]
     else:

latest version/run.bat

@@ -1,3 +1,4 @@
 cd /d %~dp0
 :: Develop server
 python -B main.py
+pause

latest version/server/__init__.py

@@ -1,6 +1,7 @@
-from core.config_manager import Config
 from flask import Blueprint
 
+from core.config_manager import Config
+
 from . import (auth, course, friend, multiplayer, others, present, purchase,
                score, user, world)
 

latest version/server/arcscore.py

@@ -1,56 +0,0 @@
-from core.sql import Connect
-
-
-def calculate_rating(defnum, score):
-    # 计算rating
-    if score >= 10000000:
-        ptt = defnum + 2
-    elif score < 9800000:
-        ptt = defnum + (score-9500000) / 300000
-        if ptt < 0 and defnum != -10:
-            ptt = 0
-    else:
-        ptt = defnum + 1 + (score-9800000) / 200000
-
-    return ptt
-
-
-def refresh_all_score_rating():
-    # 刷新所有best成绩的rating
-    error = 'Unknown error.'
-
-    with Connect() as c:
-        c.execute(
-            '''select song_id, rating_pst, rating_prs, rating_ftr, rating_byn from chart''')
-        x = c.fetchall()
-
-    if x:
-        song_list = [i[0] for i in x]
-        with Connect() as c:
-            c.execute('''update best_score set rating=0 where song_id not in ({0})'''.format(
-                ','.join(['?']*len(song_list))), tuple(song_list))
-            for i in x:
-                for j in range(0, 4):
-                    defnum = -10  # 没在库里的全部当做定数-10
-                    if i is not None:
-                        defnum = float(i[j+1]) / 10
-                        if defnum <= 0:
-                            defnum = -10  # 缺少难度的当做定数-10
-
-                    c.execute('''select user_id, score from best_score where song_id=:a and difficulty=:b''', {
-                              'a': i[0], 'b': j})
-                    y = c.fetchall()
-                    if y:
-                        for k in y:
-                            ptt = calculate_rating(defnum, k[1])
-                            if ptt < 0:
-                                ptt = 0
-
-                            c.execute('''update best_score set rating=:a where user_id=:b and song_id=:c and difficulty=:d''', {
-                                      'a': ptt, 'b': k[0], 'c': i[0], 'd': j})
-            error = None
-
-    else:
-        error = 'No song data.'
-
-    return error

latest version/server/auth.py

@@ -1,13 +1,13 @@
 import base64
 from functools import wraps
 
-from core.config_manager import Config
+from flask import Blueprint, current_app, g, jsonify, request
+
 from core.error import ArcError, NoAccess
 from core.sql import Connect
 from core.user import UserAuth, UserLogin
-from flask import Blueprint, jsonify, request
 
-from .func import arc_try, error_return
+from .func import arc_try, error_return, header_check
 
 bp = Blueprint('auth', __name__, url_prefix='/auth')
 
@@ -16,10 +16,9 @@ bp = Blueprint('auth', __name__, url_prefix='/auth')
 @arc_try
 def login():
     headers = request.headers
-    if 'AppVersion' in headers:  # 版本检查
+    e = header_check(request)
-        if Config.ALLOW_APPVERSION:
+    if e is not None:
-            if headers['AppVersion'] not in Config.ALLOW_APPVERSION:
+        raise e
-                raise NoAccess('Wrong app version.', 1203)
 
     request.form['grant_type']
     with Connect() as c:
@@ -37,24 +36,35 @@ def login():
         return jsonify({"success": True, "token_type": "Bearer", 'user_id': user.user_id, 'access_token': user.token})
 
 
-def auth_required(request):
+@bp.route('/verify', methods=['POST'])  # 邮箱验证进度查询
+@arc_try
+def email_verify():
+    raise ArcError('Email verification unavailable.', 151, status=404)
+
+
+def auth_required(req):
     # arcaea登录验证，写成了修饰器
     def decorator(view):
         @wraps(view)
         def wrapped_view(*args, **kwargs):
 
-            headers = request.headers
+            headers = req.headers
 
-            if 'AppVersion' in headers:  # 版本检查
+            e = header_check(req)
-                if Config.ALLOW_APPVERSION:
+            if e is not None:
-                    if headers['AppVersion'] not in Config.ALLOW_APPVERSION:
+                current_app.logger.warning(
-                        return error_return(NoAccess('Wrong app version.', 1203))
+                    f' - {e.error_code}|{e.api_error_code}: {e}')
+                return error_return(e)
 
             with Connect() as c:
                 try:
                     user = UserAuth(c)
-                    user.token = headers['Authorization'][7:]
+                    token = headers.get('Authorization')
+                    if not token:
+                        raise NoAccess('No token.', -4)
+                    user.token = token[7:]
                     user_id = user.token_get_id()
+                    g.user = user
                 except ArcError as e:
                     return error_return(e)
             return view(user_id, *args, **kwargs)

latest version/server/course.py

@@ -1,9 +1,10 @@
+from flask import Blueprint, request
+
 from core.constant import Constant
 from core.course import UserCourseList
 from core.item import ItemCore
 from core.sql import Connect
 from core.user import UserOnline
-from flask import Blueprint, request
 
 from .auth import auth_required
 from .func import arc_try, success_return
@@ -19,7 +20,7 @@ def course_me(user_id):
         user = UserOnline(c, user_id)
         core = ItemCore(c)
         core.item_id = 'core_course_skip_purchase'
-        core.select(user)
+        core.select_user_item(user)
         x = UserCourseList(c, user)
         x.select_all()
         return success_return({

latest version/server/friend.py

@@ -1,6 +1,7 @@
+from flask import Blueprint, request
+
 from core.sql import Connect
 from core.user import UserOnline, code_get_id
-from flask import Blueprint, request
 
 from .auth import auth_required
 from .func import arc_try, success_return

latest version/server/func.py

@@ -1,9 +1,17 @@
 from functools import wraps
 from traceback import format_exc
 
+from flask import current_app, g, jsonify
+
 from core.config_manager import Config
-from core.error import ArcError
+from core.error import ArcError, NoAccess
-from flask import current_app, jsonify
+
+has_arc_hash = False
+try:
+    from core.arc_crypto import ArcHashChecker  # type: ignore
+    has_arc_hash = True
+except ModuleNotFoundError:
+    pass
 
 default_error = ArcError('Unknown Error', status=500)
 
@@ -32,6 +40,8 @@ def error_return(e: ArcError = default_error):  # 错误返回
     # 124 你今天不能再使用这个IP地址创建新的账号
     # 150 非常抱歉您已被限制使用此功能
     # 151 目前无法使用此功能
+    # 160 账户未邮箱认证，请检查邮箱
+    # 161  账户认证过期，请重新注册
     # 401 用户不存在
     # 403 无法连接至服务器
     # 501 502 -6 此物品目前无法获取
@@ -43,6 +53,7 @@ def error_return(e: ArcError = default_error):  # 错误返回
     # 604 你不能加自己为好友
     # 903 下载量超过了限制，请24小时后重试
     # 905 请在再次使用此功能前等待24小时
+    # 910 重新请求验证邮件前需等待x分钟 extra: retry_at
     # 1001 设备数量达到上限
     # 1002 此设备已使用过此功能
     # 1201 房间已满
@@ -78,11 +89,26 @@ def arc_try(view):
             data = view(*args, **kwargs)
             if data is None:
                 return error_return()
-            else:
             return data
         except ArcError as e:
             if Config.ALLOW_WARNING_LOG:
                 current_app.logger.warning(format_exc())
+            user = g.get("user", None)
+            current_app.logger.warning(
+                f'{user.user_id if user is not None else ""} - {e.error_code}|{e.api_error_code}: {e}')
             return error_return(e)
 
     return wrapped_view
+
+
+def header_check(request) -> ArcError:
+    '''检查请求头是否合法'''
+    headers = request.headers
+    if Config.ALLOW_APPVERSION:  # 版本检查
+        if 'AppVersion' not in headers or headers['AppVersion'] not in Config.ALLOW_APPVERSION:
+            return NoAccess('Invalid app version', 1203)
+
+    if has_arc_hash and not ArcHashChecker(request).check():
+        return NoAccess('Invalid request')
+
+    return None

latest version/server/init.py

@@ -1,91 +0,0 @@
-import os
-from shutil import copy, copy2
-
-from core.sql import Connect
-from database.database_initialize import ARCAEA_SERVER_VERSION, main
-from web.system import update_database
-
-
-def try_rename(path, new_path):
-    # 尝试重命名文件，并尝试避免命名冲突，返回最终路径
-    final_path = new_path
-    if os.path.exists(new_path):
-        i = 1
-        while os.path.exists(new_path + str(i)):
-            i += 1
-        os.rename(path, new_path + str(i))
-        final_path = new_path + str(i)
-    else:
-        os.rename(path, new_path)
-
-    return final_path
-
-
-def check_before_run(app):
-    # 运行前检查关键文件，返回布尔值，其实是因为有人经常忘了
-
-    f = True
-
-    if not os.path.exists('database'):
-        app.logger.warning('Folder `database` is missing.')
-        f = False
-
-    if not os.path.exists('database/songs'):
-        app.logger.warning('Folder `database/songs` is missing.')
-        f = False
-
-    if not os.path.exists('database/arcaea_database.db'):
-        app.logger.warning('File `database/arcaea_database.db` is missing.')
-        f = False
-        try:
-            app.logger.info(
-                'Try to new the file `database/arcaea_database.db`.')
-            main('./database/')
-            app.logger.info(
-                'Success to new the file `database/arcaea_database.db`.')
-            f = True
-        except:
-            app.logger.warning(
-                'Fail to new the file `database/arcaea_database.db`.')
-
-    else:
-        with Connect() as c:
-            try:
-                c.execute('''select value from config where id="version"''')
-                x = c.fetchone()
-            except:
-                x = None
-
-        # 数据库自动更新，不强求
-        if not x or x[0] != ARCAEA_SERVER_VERSION:
-            app.logger.warning(
-                'Maybe the file `database/arcaea_database.db` is an old version.')
-            try:
-                app.logger.info(
-                    'Try to update the file `database/arcaea_database.db`.')
-
-                path = try_rename('database/arcaea_database.db',
-                                  'database/arcaea_database.db.bak')
-
-                try:
-                    copy2(path, 'database/arcaea_database.db')
-                except:
-                    copy(path, 'database/arcaea_database.db')
-
-                if os.path.isfile("database/old_arcaea_database.db"):
-                    os.remove('database/old_arcaea_database.db')
-
-                try_rename('database/arcaea_database.db',
-                           'database/old_arcaea_database.db')
-
-                main('./database/')
-                update_database()
-
-                app.logger.info(
-                    'Success to update the file `database/arcaea_database.db`.')
-
-            except:
-                app.logger.warning(
-                    'Fail to update the file `database/arcaea_database.db`.')
-
-    return f

latest version/server/multiplayer.py

@@ -1,8 +1,9 @@
+from flask import Blueprint, request
+
 from core.config_manager import Config
 from core.error import ArcError
 from core.linkplay import Player, RemoteMultiPlayer, Room
 from core.sql import Connect
-from flask import Blueprint, request
 
 from .auth import auth_required
 from .func import arc_try, success_return

latest version/server/others.py

@@ -1,13 +1,14 @@
 import json
 from urllib.parse import parse_qs, urlparse
 
+from flask import Blueprint, jsonify, request
+from werkzeug.datastructures import ImmutableMultiDict
+
 from core.download import DownloadList
 from core.error import RateLimit
 from core.sql import Connect
 from core.system import GameInfo
 from core.user import UserOnline
-from flask import Blueprint, jsonify, request
-from werkzeug.datastructures import ImmutableMultiDict
 
 from .auth import auth_required
 from .func import arc_try, error_return, success_return

latest version/server/present.py

@@ -1,11 +1,11 @@
-from core.error import ArcError
+from flask import Blueprint, request
+
 from core.present import UserPresent, UserPresentList
 from core.sql import Connect
 from core.user import UserOnline
-from flask import Blueprint, request
 
 from .auth import auth_required
-from .func import arc_try, error_return, success_return
+from .func import arc_try, success_return
 
 bp = Blueprint('present', __name__, url_prefix='/present')
 

latest version/server/purchase.py

@@ -1,12 +1,13 @@
 from time import time
 
+from flask import Blueprint, request
+
 from core.error import InputError, ItemUnavailable, PostError
 from core.item import ItemFactory, Stamina6
 from core.purchase import Purchase, PurchaseList
 from core.redeem import UserRedeem
 from core.sql import Connect
 from core.user import UserOnline
-from flask import Blueprint, request
 
 from .auth import auth_required
 from .func import arc_try, success_return

latest version/server/score.py

@@ -1,12 +1,13 @@
 from time import time
-from core.course import CoursePlay
 
+from flask import Blueprint, request
+
+from core.course import CoursePlay
 from core.error import InputError
 from core.rank import RankList
 from core.score import UserPlay
 from core.sql import Connect
 from core.user import UserOnline
-from flask import Blueprint, request
 
 from .auth import auth_required
 from .func import arc_try, success_return
@@ -24,18 +25,16 @@ def score_token():
 @arc_try
 def score_token_world(user_id):
 
-    stamina_multiply = int(
+    stamina_multiply = int(request.args.get('stamina_multiply', 1))
-        request.args['stamina_multiply']) if 'stamina_multiply' in request.args else 1
+    fragment_multiply = int(request.args.get('fragment_multiply', 100))
-    fragment_multiply = int(
+    prog_boost_multiply = int(request.args.get('prog_boost_multiply', 0))
-        request.args['fragment_multiply']) if 'fragment_multiply' in request.args else 100
+    beyond_boost_gauge_use = int(request.args.get('beyond_boost_gauge_use', 0))
-    prog_boost_multiply = int(
-        request.args['prog_boost_multiply']) if 'prog_boost_multiply' in request.args else 0
     with Connect() as c:
         x = UserPlay(c, UserOnline(c, user_id))
         x.song.set_chart(request.args['song_id'], int(
             request.args['difficulty']))
-        x.set_play_state_for_world(stamina_multiply,
+        x.set_play_state_for_world(
-                                   fragment_multiply, prog_boost_multiply)
+            stamina_multiply, fragment_multiply, prog_boost_multiply, beyond_boost_gauge_use)
         return success_return({
             "stamina": x.user.stamina.stamina,
             "max_stamina_ts": x.user.stamina.max_stamina_ts,
@@ -96,6 +95,8 @@ def song_score_post(user_id):
                     request.form['miss_count'], request.form['health'], request.form['modifier'], int(time() * 1000), request.form['clear_type'])
         x.beyond_gauge = int(request.form['beyond_gauge'])
         x.submission_hash = request.form['submission_hash']
+        if 'combo_interval_bonus' in request.form:
+            x.combo_interval_bonus = int(request.form['combo_interval_bonus'])
         if not x.is_valid:
             raise InputError('Invalid score.', 107)
         x.upload_score()

latest version/server/user.py

@@ -1,14 +1,14 @@
+from flask import Blueprint, request
+
 from core.character import UserCharacter
-from core.config_manager import Config
+from core.error import ArcError
-from core.error import ArcError, NoAccess
 from core.item import ItemCore
 from core.save import SaveData
 from core.sql import Connect
 from core.user import User, UserLogin, UserOnline, UserRegister
-from flask import Blueprint, request
 
 from .auth import auth_required
-from .func import arc_try, success_return
+from .func import arc_try, header_check, success_return
 
 bp = Blueprint('user', __name__, url_prefix='/user')
 
@@ -16,10 +16,9 @@ bp = Blueprint('user', __name__, url_prefix='/user')
 @bp.route('', methods=['POST'])  # 注册接口
 @arc_try
 def register():
-    if 'AppVersion' in request.headers:  # 版本检查
+    error = header_check(request)
-        if Config.ALLOW_APPVERSION:
+    if error is not None:
-            if request.headers['AppVersion'] not in Config.ALLOW_APPVERSION:
+        raise error
-                raise NoAccess('Wrong app version.', 1203)
 
     with Connect() as c:
         new_user = UserRegister(c)
@@ -155,7 +154,7 @@ def sys_set(user_id, set_arg):
             user.change_favorite_character(int(value))
         else:
             value = 'true' == value
-            if 'is_hide_rating' == set_arg or 'max_stamina_notification_enabled' == set_arg:
+            if set_arg in ('is_hide_rating', 'max_stamina_notification_enabled'):
                 user.update_user_one_column(set_arg, value)
         return success_return(user.to_dict())
 
@@ -165,3 +164,9 @@ def sys_set(user_id, set_arg):
 @arc_try
 def user_delete(user_id):
     raise ArcError('Cannot delete the account.', 151, status=404)
+
+
+@bp.route('/email/resend_verify', methods=['POST'])  # 邮箱验证重发
+@arc_try
+def email_resend_verify():
+    raise ArcError('Email verification unavailable.', 151, status=404)

latest version/server/world.py

@@ -1,7 +1,8 @@
+from flask import Blueprint, request
+
 from core.sql import Connect
 from core.user import UserOnline
 from core.world import UserMap, get_world_all
-from flask import Blueprint, request
 
 from .auth import auth_required
 from .func import arc_try, success_return

latest version/web/index.py

@@ -1,11 +1,11 @@
 import os
 import time
 
-import server.arcscore
-from core.download import DownloadList, initialize_songfile
 from core.init import FileChecker
+from core.operation import RefreshAllScoreRating, RefreshSongFileCache, SaveUpdateScore, UnlockUserItem
 from core.rank import RankList
 from core.sql import Connect
+from core.user import User
 from flask import Blueprint, flash, redirect, render_template, request, url_for
 from werkzeug.utils import secure_filename
 
@@ -290,8 +290,7 @@ def update_database():
 def update_song_hash():
     # 更新数据库内谱面文件hash值
     try:
-        DownloadList.clear_all_cache()
+        RefreshSongFileCache().run()
-        initialize_songfile()
         flash('数据刷新成功 Success refresh data.')
     except:
         flash('Something error!')
@@ -302,10 +301,7 @@ def update_song_hash():
 @login_required
 def update_song_rating():
     # 更新所有分数的rating
-    error = server.arcscore.refresh_all_score_rating()
+    RefreshAllScoreRating().run()
-    if error:
-        flash(error)
-    else:
     flash('数据刷新成功 Success refresh data.')
     return render_template('web/updatedatabase.html')
 
@@ -426,7 +422,7 @@ def all_character():
 def change_character():
     # 修改角色数据
     skill_ids = ['No_skill', 'gauge_easy', 'note_mirror', 'gauge_hard', 'frag_plus_10_pack_stellights', 'gauge_easy|frag_plus_15_pst&prs', 'gauge_hard|fail_frag_minus_100', 'frag_plus_5_side_light', 'visual_hide_hp', 'frag_plus_5_side_conflict', 'challenge_fullcombo_0gauge', 'gauge_overflow', 'gauge_easy|note_mirror', 'note_mirror', 'visual_tomato_pack_tonesphere',
-                 'frag_rng_ayu', 'gaugestart_30|gaugegain_70', 'combo_100-frag_1', 'audio_gcemptyhit_pack_groovecoaster', 'gauge_saya', 'gauge_chuni', 'kantandeshou', 'gauge_haruna', 'frags_nono', 'gauge_pandora', 'gauge_regulus', 'omatsuri_daynight', 'sometimes(note_mirror|frag_plus_5)', 'scoreclear_aa|visual_scoregauge', 'gauge_tempest', 'gauge_hard', 'gauge_ilith_summer', 'frags_kou', 'visual_ink', 'shirabe_entry_fee', 'frags_yume', 'note_mirror|visual_hide_far', 'frags_ongeki', 'gauge_areus', 'gauge_seele', 'gauge_isabelle', 'gauge_exhaustion', 'skill_lagrange', 'gauge_safe_10', 'frags_nami', 'skill_elizabeth', 'skill_lily', 'skill_kanae_midsummer', 'eto_uncap', 'luna_uncap', 'frags_preferred_song', 'visual_ghost_skynotes', 'ayu_uncap', 'skill_vita', 'skill_fatalis', 'skill_reunion', 'frags_ongeki_slash', 'frags_ongeki_hard', 'skill_amane']
+                 'frag_rng_ayu', 'gaugestart_30|gaugegain_70', 'combo_100-frag_1', 'audio_gcemptyhit_pack_groovecoaster', 'gauge_saya', 'gauge_chuni', 'kantandeshou', 'gauge_haruna', 'frags_nono', 'gauge_pandora', 'gauge_regulus', 'omatsuri_daynight', 'sometimes(note_mirror|frag_plus_5)', 'scoreclear_aa|visual_scoregauge', 'gauge_tempest', 'gauge_hard', 'gauge_ilith_summer', 'frags_kou', 'visual_ink', 'shirabe_entry_fee', 'frags_yume', 'note_mirror|visual_hide_far', 'frags_ongeki', 'gauge_areus', 'gauge_seele', 'gauge_isabelle', 'gauge_exhaustion', 'skill_lagrange', 'gauge_safe_10', 'frags_nami', 'skill_elizabeth', 'skill_lily', 'skill_kanae_midsummer', 'eto_uncap', 'luna_uncap', 'frags_preferred_song', 'visual_ghost_skynotes', 'ayu_uncap', 'skill_vita', 'skill_fatalis', 'skill_reunion', 'frags_ongeki_slash', 'frags_ongeki_hard', 'skill_amane', 'skill_kou_winter', 'gauge_hard|note_mirror', 'skill_shama', 'skill_milk', 'skill_shikoku', 'skill_mika', 'ilith_awakened_skill', 'skill_mithra', 'skill_toa']
     return render_template('web/changechar.html', skill_ids=skill_ids)
 
 
@@ -610,7 +606,7 @@ def edit_user_purchase():
         if 'name' not in request.form and 'user_code' not in request.form:
             flag = False
             if method == '0':
-                web.system.unlock_all_user_item(c)
+                UnlockUserItem().run()
             else:
                 c.execute(
                     '''delete from user_item where type in ('pack', 'single')''')
@@ -636,7 +632,9 @@ def edit_user_purchase():
                 user_id = user_id[0]
 
                 if method == '0':
-                    web.system.unlock_user_item(c, user_id)
+                    x = UnlockUserItem()
+                    x.set_params(user_id=user_id)
+                    x.run()
                 else:
                     c.execute('''delete from user_item where type in ('pack', 'single') and user_id = :user_id''', {
                         'user_id': user_id})
@@ -942,7 +940,7 @@ def update_user_save():
         # 全修改
         if 'name' not in request.form and 'user_code' not in request.form:
             flag = False
-            web.system.update_all_save(c)
+            SaveUpdateScore().run()
             flash("全部用户存档同步成功 Successfully update all users' saves.")
 
         else:
@@ -962,7 +960,9 @@ def update_user_save():
             user_id = c.fetchone()
             if user_id:
                 user_id = user_id[0]
-                web.system.update_one_save(c, user_id)
+                user = User()
+                user.user_id = user_id
+                SaveUpdateScore(user).run()
                 flash("用户存档同步成功 Successfully update the user's saves.")
 
             else:

latest version/web/system.py

@@ -40,41 +40,6 @@ def update_user_char(c):
                           (j[0], i[0], i[1], exp, i[2], 0))
 
 
-def unlock_all_user_item(c):
-    # 解锁所有用户购买
-
-    c.execute('''select user_id from user''')
-    x = c.fetchall()
-    c.execute('''select item_id, type from purchase_item''')
-    y = c.fetchall()
-    if x and y:
-        for i in x:
-            for j in y:
-                c.execute('''select exists(select * from user_item where user_id=:a and item_id=:b and type=:c)''', {
-                    'a': i[0], 'b': j[0], 'c': j[1]})
-                if c.fetchone() == (0,) and j[1] != 'character':
-                    c.execute('''insert into user_item values(:a,:b,:c,1)''', {
-                        'a': i[0], 'b': j[0], 'c': j[1]})
-
-    return
-
-
-def unlock_user_item(c, user_id):
-    # 解锁用户购买
-
-    c.execute('''select item_id, type from purchase_item''')
-    y = c.fetchall()
-
-    for j in y:
-        c.execute('''select exists(select * from user_item where user_id=:a and item_id=:b and type=:c)''', {
-            'a': user_id, 'b': j[0], 'c': j[1]})
-        if c.fetchone() == (0,) and j[1] != 'character':
-            c.execute('''insert into user_item values(:a,:b,:c,1)''', {
-                'a': user_id, 'b': j[0], 'c': j[1]})
-
-    return
-
-
 def get_all_item():
     # 所有物品数据查询
     with Connect() as c:
@@ -132,61 +97,6 @@ def get_all_purchase():
     return re
 
 
-def update_one_save(c, user_id):
-    # 同步指定用户存档
-    # 注意，best_score表不比较，直接覆盖
-    return
-
-    # c.execute('''select scores_data, clearlamps_data from user_save where user_id=:a''', {
-    #           'a': user_id})
-    # x = c.fetchone()
-    # if x:
-    #     scores = json.loads(x[0])[""]
-    #     clearlamps = json.loads(x[1])[""]
-    #     clear_song_id_difficulty = []
-    #     clear_state = []
-    #     for i in clearlamps:
-    #         clear_song_id_difficulty.append(i['song_id']+str(i['difficulty']))
-    #         clear_state.append(i['clear_type'])
-
-    #     for i in scores:
-    #         rating = server.arcscore.get_one_ptt(
-    #             i['song_id'], i['difficulty'], i['score'])
-    #         if rating < 0:
-    #             rating = 0
-    #         try:
-    #             index = clear_song_id_difficulty.index(
-    #                 i['song_id'] + str(i['difficulty']))
-    #         except:
-    #             index = -1
-    #         if index != -1:
-    #             clear_type = clear_state[index]
-    #         else:
-    #             clear_type = 0
-    #         c.execute('''delete from best_score where user_id=:a and song_id=:b and difficulty=:c''', {
-    #             'a': user_id, 'b': i['song_id'], 'c': i['difficulty']})
-    #         c.execute('''insert into best_score values(:a, :b, :c, :d, :e, :f, :g, :h, :i, :j, :k, :l, :m, :n)''', {
-    #             'a': user_id, 'b': i['song_id'], 'c': i['difficulty'], 'd': i['score'], 'e': i['shiny_perfect_count'], 'f': i['perfect_count'], 'g': i['near_count'], 'h': i['miss_count'], 'i': i['health'], 'j': i['modifier'], 'k': i['time_played'], 'l': clear_type, 'm': clear_type, 'n': rating})
-
-    #     ptt = server.arcscore.get_user_ptt(c, user_id)  # 更新PTT
-    #     c.execute('''update user set rating_ptt=:a where user_id=:b''', {
-    #         'a': ptt, 'b': user_id})
-
-    # return
-
-
-def update_all_save(c):
-    # 同步所有用户存档
-
-    c.execute('''select user_id from user_save''')
-    x = c.fetchall()
-    if x:
-        for i in x:
-            update_one_save(c, i[0])
-
-    return
-
-
 def add_one_present(present_id, expire_ts, description, item_id, item_type, item_amount):
     # 添加一个奖励