fix(download): ensure rangefetcher loads before abstractfile; skip queryString for blob; add Range probe

README.md

@@ -33,6 +33,55 @@ http://<服务器IP>/
 - 创建 `systemd` 服务，使用 `gunicorn` 直接监听 `0.0.0.0:80`
 - 开放防火墙 `80/tcp`（如系统启用了 `ufw`）
 
+## 全命令部署（使用 Docker 部署 MongoDB）
+
+适用系统：Ubuntu 20.04+/22.04+/24.04（需 root），MongoDB 通过 Docker 启动，其余步骤照常。
+
+1. 安装 Docker 并启动：
+   ```bash
+   sudo apt update
+   sudo apt install -y docker.io
+   sudo systemctl enable --now docker
+   ```
+2. 启动 MongoDB 容器（持久化到 `/srv/taiko-web-mongo`，监听 `27017`）：
+   ```bash
+   sudo mkdir -p /srv/taiko-web-mongo
+   sudo docker run -d \
+     --name taiko-web-mongo \
+     --restart unless-stopped \
+     -v /srv/taiko-web-mongo:/data/db \
+     -p 27017:27017 \
+     mongo:6
+   ```
+   如需开启认证，可加上：
+   ```bash
+   -e MONGO_INITDB_ROOT_USERNAME=<用户名> -e MONGO_INITDB_ROOT_PASSWORD=<强密码>
+   ```
+   并在应用侧通过环境变量指定 Host：
+   ```bash
+   export TAIKO_WEB_MONGO_HOST=127.0.0.1:27017
+   ```
+3. 安装并启动 Redis（照常）：
+   ```bash
+   sudo apt install -y redis-server
+   sudo systemctl enable --now redis-server
+   ```
+4. 准备项目与虚拟环境（照常）：
+   ```bash
+   sudo mkdir -p /srv/taiko-web
+   sudo rsync -a --delete --exclude '.git' --exclude '.venv' . /srv/taiko-web/
+   sudo python3 -m venv /srv/taiko-web/.venv
+   sudo /srv/taiko-web/.venv/bin/pip install -U pip
+   sudo /srv/taiko-web/.venv/bin/pip install -r /srv/taiko-web/requirements.txt
+   sudo cp /srv/taiko-web/config.example.py /srv/taiko-web/config.py
+   ```
+5. 赋予 80 端口绑定权限并启动：
+   ```bash
+   sudo setcap 'cap_net_bind_service=+ep' /srv/taiko-web/.venv/bin/python3
+   export TAIKO_WEB_MONGO_HOST=${TAIKO_WEB_MONGO_HOST:-127.0.0.1:27017}
+   sudo /srv/taiko-web/.venv/bin/gunicorn -b 0.0.0.0:80 app:app
+   ```
+
 ## 手动部署（可选）
 
 1. 安装依赖：
@@ -94,3 +143,30 @@ docker run --detach \
 ---
 
 如需将监听接口改为仅内网或增加并发工作数（例如 `--workers 4`），可在 `setup.sh` 或 `systemd` 服务中调整。
+## 歌曲类型（Type）
+
+- 可选枚举：
+  - 01 Pop
+  - 02 Anime
+  - 03 Vocaloid
+  - 04 Children and Folk
+  - 05 Variety
+  - 06 Classical
+  - 07 Game Music
+  - 08 Live Festival Mode
+  - 09 Namco Original
+  - 10 Taiko Towers
+  - 11 Dan Dojo
+
+### 上传要求
+- 上传表单新增必填字段 `song_type`，取值为上述枚举之一
+- 成功后将写入 MongoDB `songs.song_type`
+
+### API 扩展
+- `GET /api/songs?type=<歌曲类型>` 按类型过滤返回启用歌曲
+- 示例：`/api/songs?type=02%20Anime`
+- 返回项包含 `song_type` 字段
+
+### 前端切换
+- 在歌曲选择页顶部显示当前歌曲类型标签
+- 使用左右跳转（Shift+左右或肩键）自动切换类型并刷新列表

app.py

@@ -45,6 +45,19 @@ def take_config(name, required=False):
         return None
 
 app = Flask(__name__)
+SONG_TYPES = [
+    "01 Pop",
+    "02 Anime",
+    "03 Vocaloid",
+    "04 Children and Folk",
+    "05 Variety",
+    "06 Classical",
+    "07 Game Music",
+    "08 Live Festival Mode",
+    "09 Namco Original",
+    "10 Taiko Towers",
+    "11 Dan Dojo",
+]
 
 def get_remote_address() -> str:
     return flask.request.headers.get("CF-Connecting-IP") or flask.request.headers.get("X-Forwarded-For") or flask.request.remote_addr or "127.0.0.1"
@@ -90,6 +103,7 @@ sess.init_app(app)
 db = client[take_config('MONGO', required=True)['database']]
 db.users.create_index('username', unique=True)
 db.songs.create_index('id', unique=True)
+db.songs.create_index('song_type')
 db.scores.create_index('username')
 
 
@@ -480,7 +494,13 @@ def route_api_preview():
 @app.route(basedir + 'api/songs')
 @app.cache.cached(timeout=15)
 def route_api_songs():
-    songs = list(db.songs.find({'enabled': True}, {'_id': False, 'enabled': False}))
+    type_q = flask.request.args.get('type')
+    query = {'enabled': True}
+    if type_q:
+        if type_q not in SONG_TYPES:
+            return abort(400)
+        query['song_type'] = type_q
+    songs = list(db.songs.find(query, {'_id': False, 'enabled': False}))
     for song in songs:
         if song['maker_id']:
             if song['maker_id'] == 0:
@@ -853,6 +873,12 @@ def upload_file():
         db_entry['enabled'] = True
         pprint.pprint(db_entry)
 
+        # 必要な歌曲类型
+        song_type = flask.request.form.get('song_type')
+        if not song_type or song_type not in SONG_TYPES:
+            return flask.jsonify({'error': 'invalid_song_type'})
+        db_entry['song_type'] = song_type
+
         # mongoDBにデータをぶち込む（重複IDは部分更新で上書きし、_id を不変に保つ）
         coll = client['taiko']["songs"]
         try:

public/src/js/abstractfile.js

@@ -47,21 +47,33 @@ class RemoteFile{
 		}
 	}
 	arrayBuffer(){
-		return loader.ajax(this.url, request => {
-			request.responseType = "arraybuffer"
-		})
+		var name = this.name.toLowerCase()
+		if(name.endsWith(".ogg") || name.endsWith(".png") || name.endsWith(".gif") || name.endsWith(".tja") || name.endsWith(".osu")){
+			return RangeFetcher.fetchArrayBuffer(this.url, {concurrency: 4, chunkSize: 1048576}).catch(() => loader.ajax(this.url, request => { request.responseType = "arraybuffer" }))
+		}
+		return loader.ajax(this.url, request => { request.responseType = "arraybuffer" })
 	}
 	read(encoding){
 		if(encoding){
+			var name = this.name.toLowerCase()
+			if(name.endsWith(".tja") || name.endsWith(".osu")){
+				return RangeFetcher.fetchText(this.url, {concurrency: 4, chunkSize: 262144}).catch(() => this.blob().then(blob => readFile(blob, false, encoding)))
+			}
 			return this.blob().then(blob => readFile(blob, false, encoding))
 		}else{
+			var name = this.name.toLowerCase()
+			if(name.endsWith(".tja") || name.endsWith(".osu")){
+				return RangeFetcher.fetchText(this.url, {concurrency: 4, chunkSize: 262144}).catch(() => loader.ajax(this.url))
+			}
 			return loader.ajax(this.url)
 		}
 	}
 	blob(){
-		return loader.ajax(this.url, request => {
-			request.responseType = "blob"
-		})
+		var name = this.name.toLowerCase()
+		if(name.endsWith(".ogg") || name.endsWith(".png") || name.endsWith(".gif")){
+			return RangeFetcher.fetchBlob(this.url, {concurrency: 4, chunkSize: 1048576}).catch(() => loader.ajax(this.url, request => { request.responseType = "blob" }))
+		}
+		return loader.ajax(this.url, request => { request.responseType = "blob" })
 	}
 }
 class LocalFile{

public/src/js/assets.js

@@ -36,6 +36,7 @@ var assets = {
 		"account.js",
 		"lyrics.js",
 		"customsongs.js",
+		"rangefetcher.js",
 		"abstractfile.js",
 		"idb.js",
 		"plugins.js",

public/src/js/loader.js

@@ -23,8 +23,8 @@ class Loader{
 		
 		Promise.all(promises).then(this.run.bind(this))
 	}
-	run(){
-		this.promises = []
+		run(){
+			this.promises = []
 		this.loaderDiv = document.querySelector("#loader")
 		this.loaderPercentage = document.querySelector("#loader .percentage")
 		this.loaderProgress = document.querySelector("#loader .progress")
@@ -35,12 +35,10 @@ class Loader{
 			this.addPromise(this.loadScript(gameConfig.custom_js), gameConfig.custom_js)
 		}
 		var oggSupport = new Audio().canPlayType("audio/ogg;codecs=vorbis")
-		if(!oggSupport){
-			assets.js.push("lib/oggmented-wasm.js")
-		}
-		assets.js.forEach(name => {
-			this.addPromise(this.loadScript("src/js/" + name), "src/js/" + name)
-		})
+			if(!oggSupport){
+				assets.js.push("lib/oggmented-wasm.js")
+			}
+			this.addPromise(this.prefetchAndLoadScripts(assets.js), "src/js/*")
 		
 		var pageVersion = versionLink.href
 		var index = pageVersion.lastIndexOf("/")
@@ -399,6 +397,26 @@ class Loader{
 			}, e => this.errorMsg(e))
 		})
 	}
+	prefetchAndLoadScripts(names){
+		var urls = names.map(name => "src/js/" + name + this.queryString)
+		var fetches = urls.map(url => this.ajax(url, r => { r.responseType = "arraybuffer" }))
+		return Promise.all(fetches).then(buffers => {
+			var chain = Promise.resolve()
+			for(let i=0;i<buffers.length;i++){
+				chain = chain.then(() => {
+					var blob = new Blob([buffers[i]], {type: "application/javascript"})
+					var u = URL.createObjectURL(blob)
+					return this.loadScript(u).then(() => { URL.revokeObjectURL(u) })
+				})
+			}
+			return chain
+		}).catch(() => {
+			names.forEach(name => {
+				this.addPromise(this.loadScript("src/js/" + name), "src/js/" + name)
+			})
+			return Promise.resolve()
+		})
+	}
 	addPromise(promise, url){
 		this.promises.push(promise)
 		promise.then(this.assetLoaded.bind(this), response => {
@@ -558,7 +576,8 @@ class Loader{
 	}
 	loadScript(url){
 		var script = document.createElement("script")
-		var url = url + this.queryString
+		var isBlob = typeof url === "string" && (url.startsWith("blob:") || url.startsWith("data:"))
+		var url = isBlob ? url : (url + this.queryString)
 		var promise = pageEvents.load(script)
 		script.src = url
 		document.head.appendChild(script)

public/src/js/rangefetcher.js

@@ -0,0 +1,130 @@
+var RangeFetcher = {
+    _head: function(url){
+        return new Promise(function(resolve){
+            var r = new XMLHttpRequest()
+            r.open("HEAD", url)
+            r.onreadystatechange = function(){
+                if(r.readyState === 4){
+                    var len = parseInt(r.getResponseHeader("Content-Length")) || null
+                    var ranges = r.getResponseHeader("Accept-Ranges") || ""
+                    resolve({length: len, acceptRanges: /bytes/i.test(ranges)})
+                }
+            }
+            r.onerror = function(){ resolve({length: null, acceptRanges: false}) }
+            r.send()
+        })
+    },
+    _getRange: function(url, start, end, responseType){
+        return new Promise(function(resolve, reject){
+            var r = new XMLHttpRequest()
+            r.open("GET", url)
+            r.responseType = responseType || "arraybuffer"
+            r.setRequestHeader("Range", "bytes=" + start + "-" + end)
+            r.onload = function(){
+                if(r.status === 206 || r.status === 200){
+                    resolve(r.response)
+                }else{
+                    reject(r.status)
+                }
+            }
+            r.onerror = function(){ reject("network") }
+            r.send()
+        })
+    },
+    _getAll: function(url, responseType){
+        return new Promise(function(resolve, reject){
+            var r = new XMLHttpRequest()
+            r.open("GET", url)
+            r.responseType = responseType || "arraybuffer"
+            r.onload = function(){
+                if(r.status === 200){
+                    resolve(r.response)
+                }else{
+                    reject(r.status)
+                }
+            }
+            r.onerror = function(){ reject("network") }
+            r.send()
+        })
+    },
+    _probeRange: function(url){
+        return new Promise(function(resolve){
+            var r = new XMLHttpRequest()
+            r.open("GET", url)
+            r.responseType = "arraybuffer"
+            r.setRequestHeader("Range", "bytes=0-0")
+            r.onload = function(){
+                var ok = r.status === 206 && !!r.getResponseHeader("Content-Range")
+                resolve(ok)
+            }
+            r.onerror = function(){ resolve(false) }
+            r.send()
+        })
+    },
+    _runConcurrent: function(tasks, limit){
+        return new Promise(function(resolve, reject){
+            var i = 0
+            var running = 0
+            var results = []
+            var done = 0
+            function next(){
+                while(running < limit && i < tasks.length){
+                    var idx = i++
+                    running++
+                    tasks[idx]().then(function(res){
+                        results[idx] = res
+                        running--
+                        done++
+                        if(done === tasks.length){ resolve(results) }
+                        else{ next() }
+                    }, function(e){ reject(e) })
+                }
+            }
+            next()
+        })
+    },
+    fetchArrayBuffer: function(url, opts){
+        opts = opts || {}
+        var concurrency = opts.concurrency || 4
+        var minChunk = opts.chunkSize || 1048576
+        var self = this
+        return this._head(url).then(function(info){
+            if(!info.length || info.length < minChunk){
+                return self._getAll(url, "arraybuffer")
+            }
+            if(!info.acceptRanges){
+                return self._probeRange(url).then(function(supported){
+                    if(!supported){
+                        return self._getAll(url, "arraybuffer")
+                    }
+                    return supported
+                })
+            }
+            var total = info.length
+            var parts = Math.ceil(total / minChunk)
+            parts = Math.max(1, Math.min(parts, 16))
+            var tasks = []
+            for(var p=0; p<parts; p++){
+                var start = p * Math.floor(total / parts)
+                var end = p === parts - 1 ? total - 1 : ( (p+1) * Math.floor(total / parts) ) - 1
+                tasks.push(function(s, e){ return function(){ return self._getRange(url, s, e, "arraybuffer") } }(start, end))
+            }
+            return self._runConcurrent(tasks, concurrency).then(function(buffers){
+                var out = new Uint8Array(total)
+                var offset = 0
+                for(var p=0; p<buffers.length; p++){
+                    var b = new Uint8Array(buffers[p])
+                    out.set(b, offset)
+                    offset += b.byteLength
+                }
+                return out.buffer
+            })
+        })
+    },
+    fetchBlob: function(url, opts){
+        return this.fetchArrayBuffer(url, opts).then(function(buf){ return new Blob([buf]) })
+    },
+    fetchText: function(url, opts){
+        return this.fetchBlob(url, opts).then(function(blob){ return blob.text() })
+    }
+}

public/src/js/songselect.js

@@ -386,6 +386,32 @@ class SongSelect{
 		}
 		
 		this.songSelect = document.getElementById("song-select")
+		this.songTypes = [
+			"01 Pop",
+			"02 Anime",
+			"03 Vocaloid",
+			"04 Children and Folk",
+			"05 Variety",
+			"06 Classical",
+			"07 Game Music",
+			"08 Live Festival Mode",
+			"09 Namco Original",
+			"10 Taiko Towers",
+			"11 Dan Dojo",
+		]
+		this.songTypeIndex = Math.max(0, Math.min(this.songTypes.length - 1, +(localStorage.getItem("songTypeIndex") || 0)))
+		this.typeLabel = document.createElement("div")
+		this.typeLabel.style.position = "absolute"
+		this.typeLabel.style.top = "8px"
+		this.typeLabel.style.left = "12px"
+		this.typeLabel.style.padding = "4px 8px"
+		this.typeLabel.style.background = "rgba(0,0,0,0.5)"
+		this.typeLabel.style.color = "#fff"
+		this.typeLabel.style.borderRadius = "6px"
+		this.typeLabel.style.fontSize = "14px"
+		this.typeLabel.style.zIndex = "10"
+		this.songSelect.appendChild(this.typeLabel)
+		this.updateTypeLabel()
 		var cat = this.songs[this.selectedSong].originalCategory
 		this.drawBackground(cat)
 		
@@ -536,24 +562,20 @@ class SongSelect{
 				this.toSession()
 			}else if(name === "left"){
 				if(shift){
-					if(!repeat){
-						this.categoryJump(-1)
-					}
+					if(!repeat){ this.changeType(-1) }
 				}else{
 					this.moveToSong(-1)
 				}
 			}else if(name === "right"){
 				if(shift){
-					if(!repeat){
-						this.categoryJump(1)
-					}
+					if(!repeat){ this.changeType(1) }
 				}else{
 					this.moveToSong(1)
 				}
 			}else if(name === "jump_left" && !repeat){
-				this.categoryJump(-1)
+				this.changeType(-1)
 			}else if(name === "jump_right" && !repeat){
-				this.categoryJump(1)
+				this.changeType(1)
 			}else if(name === "mute" || name === "ctrlGamepad"){
 				this.endPreview(true)
 				this.playBgm(false)
@@ -597,6 +619,23 @@ class SongSelect{
 			}
 		}
 	}
+
+	updateTypeLabel(){
+		this.setAltText(this.typeLabel, this.songTypes[this.songTypeIndex])
+	}
+
+	changeType(delta){
+		this.songTypeIndex = (this.songTypeIndex + delta + this.songTypes.length) % this.songTypes.length
+		localStorage.setItem("songTypeIndex", this.songTypeIndex)
+		this.updateTypeLabel()
+		var type = encodeURIComponent(this.songTypes[this.songTypeIndex])
+		loader.ajax("api/songs?type=" + type).then(resp => {
+			var songs = JSON.parse(resp)
+			assets.songsDefault = songs
+			assets.songs = assets.songsDefault
+			new SongSelect(false, false, this.touchEnabled)
+		}).catch(() => {})
+	}
 	
 	mouseDown(event){
 		if(event.target === this.selectable || event.target.parentNode === this.selectable){
@@ -2926,6 +2965,12 @@ class SongSelect{
 			var categoryName = song.category
 			var originalCategory = song.category
 		}
+		if(!categoryName){
+			if(song.song_type){
+				categoryName = song.song_type
+				originalCategory = song.song_type
+			}
+		}
 		var addedSong = {
 			title: title,
 			originalTitle: song.title,

public/upload/index.html

@@ -16,6 +16,21 @@
 
       <label for="file_music">音楽ファイル:</label>
       <input type="file" name="file_music" accept=".ogg,.mp3,.wav" required>
+
+      <label for="song_type">曲のタイプ:</label>
+      <select name="song_type" required>
+        <option value="01 Pop">01 Pop</option>
+        <option value="02 Anime">02 Anime</option>
+        <option value="03 Vocaloid">03 Vocaloid</option>
+        <option value="04 Children and Folk">04 Children and Folk</option>
+        <option value="05 Variety">05 Variety</option>
+        <option value="06 Classical">06 Classical</option>
+        <option value="07 Game Music">07 Game Music</option>
+        <option value="08 Live Festival Mode">08 Live Festival Mode</option>
+        <option value="09 Namco Original">09 Namco Original</option>
+        <option value="10 Taiko Towers">10 Taiko Towers</option>
+        <option value="11 Dan Dojo">11 Dan Dojo</option>
+      </select>
     </form>
 
     <button type="button" onclick="uploadFiles()">今すぐ投稿！ (1分ほどかかる場合があります)</button>

tjaf.py

@@ -7,6 +7,8 @@ class Tja:
         self.text = text
         self.title: Optional[str] = None
         self.subtitle: Optional[str] = None
+        self.title_ja: Optional[str] = None
+        self.subtitle_ja: Optional[str] = None
         self.wave: Optional[str] = None
         self.offset: Optional[float] = None
         self.courses: Dict[str, Dict[str, Optional[int]]] = {}
@@ -25,8 +27,12 @@ class Tja:
                 val = v.strip()
                 if key == "TITLE":
                     self.title = val or None
+                elif key == "TITLEJA":
+                    self.title_ja = val or None
                 elif key == "SUBTITLE":
                     self.subtitle = val or None
+                elif key == "SUBTITLEJA":
+                    self.subtitle_ja = val or None
                 elif key == "WAVE":
                     self.wave = val or None
                 elif key == "OFFSET":
@@ -73,8 +79,20 @@ class Tja:
             "type": "tja",
             "title": self.title,
             "subtitle": self.subtitle,
-            "title_lang": {"ja": self.title, "en": None, "cn": None, "tw": None, "ko": None},
-            "subtitle_lang": {"ja": self.subtitle, "en": None, "cn": None, "tw": None, "ko": None},
+            "title_lang": {
+                "ja": self.title_ja or self.title,
+                "en": None,
+                "cn": self.title_ja or None,
+                "tw": None,
+                "ko": None,
+            },
+            "subtitle_lang": {
+                "ja": self.subtitle_ja or self.subtitle,
+                "en": None,
+                "cn": self.subtitle_ja or None,
+                "tw": None,
+                "ko": None,
+            },
             "courses": courses_out,
             "enabled": False,
             "category_id": None,

update.sh

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+if [ "${EUID}" -ne 0 ]; then echo "需要 root 权限"; exit 1; fi
+
+SRC_DIR=$(cd "$(dirname "$0")" && pwd)
+DEST_DIR=/srv/taiko-web
+SONGS_DIR="$DEST_DIR/public/songs"
+BACKUP_DIR="$DEST_DIR/.backup_songs_$(date +%Y%m%d_%H%M%S)"
+
+systemctl stop taiko-web || true
+
+if [ -d "$SONGS_DIR" ]; then
+  mkdir -p "$BACKUP_DIR"
+  rsync -a "$SONGS_DIR/" "$BACKUP_DIR/" || cp -a "$SONGS_DIR/." "$BACKUP_DIR/"
+fi
+
+mkdir -p "$DEST_DIR"
+rsync -a --delete \
+  --exclude '.git' \
+  --exclude '.venv' \
+  --exclude 'public/songs' \
+  "$SRC_DIR/" "$DEST_DIR/"
+
+if [ -x "$DEST_DIR/.venv/bin/pip" ]; then
+  "$DEST_DIR/.venv/bin/pip" install -U pip
+  "$DEST_DIR/.venv/bin/pip" install -r "$DEST_DIR/requirements.txt"
+fi
+
+chown -R www-data:www-data "$DEST_DIR"
+
+if [ -d "$BACKUP_DIR" ]; then
+  mkdir -p "$SONGS_DIR"
+  rsync -a "$BACKUP_DIR/" "$SONGS_DIR/" || cp -a "$BACKUP_DIR/." "$SONGS_DIR/"
+fi
+
+systemctl daemon-reload || true
+systemctl restart taiko-web || systemctl start taiko-web || true
+
+systemctl is-active --quiet taiko-web