From 6fe79d298dd9de730f11c7b2a0eeed60b3c14ca4 Mon Sep 17 00:00:00 2001
From: meiseayoung <meiseayoung@gmail.com>
Date: Tue, 30 Dec 2025 12:58:42 +0800
Subject: [PATCH] chore: use x.json2 module replace json_parser

---
 README.md     |   1 -
 json_parser.v | 154 --------------------------------------------------
 upload.v      |  12 +++-
 3 files changed, 10 insertions(+), 157 deletions(-)
 delete mode 100644 json_parser.v

diff --git a/README.md b/README.md
index 5da6529..533f04e 100644
--- a/README.md
+++ b/README.md
@@ -179,7 +179,6 @@ v-hono/
 ├── config.v           # Configuration management
 ├── logger.v           # Logging system
 ├── multipart.v        # Multipart form parsing
-├── json_parser.v      # JSON parsing utilities
 ├── upload.v           # File upload handling
 ├── database.v         # Database integration
 ├── auth.v             # Authentication system
diff --git a/json_parser.v b/json_parser.v
deleted file mode 100644
index 3ca1706..0000000
--- a/json_parser.v
+++ /dev/null
@@ -1,154 +0,0 @@
-module hono
-
-// 简单的 JSON 解析器
-pub struct JsonParser {
-pub:
-	data string
-}
-
-// 创建 JSON 解析器
-pub fn new_json_parser(data string) JsonParser {
-	return JsonParser{data: data}
-}
-
-// 解析 JSON 对象
-pub fn (parser JsonParser) parse_object() !map[string]string {
-	mut result := map[string]string{}
-	
-	// 移除外层的大括号
-	data := parser.data.trim_space()
-	if !data.starts_with('{') || !data.ends_with('}') {
-		return error('Invalid JSON object format')
-	}
-	
-	content := data[1..data.len - 1]
-	
-	// 分割键值对
-	pairs := split_json_pairs(content)
-	
-	for pair in pairs {
-		key_value := split_key_value(pair) or { continue }
-		result[key_value.key] = key_value.value
-	}
-	
-	return result
-}
-
-// 键值对结构
-struct KeyValue {
-pub:
-	key   string
-	value string
-}
-
-// 分割 JSON 键值对
-fn split_json_pairs(content string) []string {
-	mut pairs := []string{}
-	mut current := ''
-	mut brace_count := 0
-	mut in_string := false
-	mut escape_next := false
-	
-	for i := 0; i < content.len; i++ {
-		ch := content[i]
-		
-		if escape_next {
-			current += ch.str()
-			escape_next = false
-			continue
-		}
-		
-		if ch == `\\` {
-			escape_next = true
-			current += ch.str()
-			continue
-		}
-		
-		if ch == `"` && !escape_next {
-			in_string = !in_string
-			current += ch.str()
-			continue
-		}
-		
-		if !in_string {
-			if ch == `{` {
-				brace_count++
-			} else if ch == `}` {
-				brace_count--
-			} else if ch == `,` && brace_count == 0 {
-				pairs << current.trim_space()
-				current = ''
-				continue
-			}
-		}
-		
-		current += ch.str()
-	}
-	
-	if current.trim_space() != '' {
-		pairs << current.trim_space()
-	}
-	
-	return pairs
-}
-
-// 分割键值对
-fn split_key_value(pair string) !KeyValue {
-	colon_index := pair.index(':') or {
-		return error('No colon found')
-	}
-	mut key := pair[..colon_index].trim_space()
-	mut value := pair[colon_index + 1..].trim_space()
-	
-	// 移除键的引号
-	if key.starts_with('"') && key.ends_with('"') {
-		key = key[1..key.len - 1]
-	}
-	
-	// 移除值的引号
-	if value.starts_with('"') && value.ends_with('"') {
-		value = value[1..value.len - 1]
-	}
-	
-	return KeyValue{key: key, value: value}
-}
-
-pub struct MergeRequest {
-	pub:
-	file_hash    string
-	filename     string
-	total_chunks int
-}
-
-// 解析合并请求
-pub fn parse_merge_request(body string) !MergeRequest {
-	if body.len == 0 {
-		return error('Empty request body')
-	}
-	
-	parser := new_json_parser(body)
-	obj := parser.parse_object() or {
-		return error('Failed to parse JSON')
-	}
-	
-	file_hash := obj['file_hash'] or {
-		return error('Missing file_hash')
-	}
-	filename := obj['filename'] or {
-		return error('Missing filename')
-	}
-	total_chunks_str := obj['total_chunks'] or {
-		return error('Missing total_chunks')
-	}
-	
-	if !total_chunks_str.is_int() {
-		return error('Invalid total_chunks')
-	}
-	total_chunks := total_chunks_str.int()
-	
-	return MergeRequest{
-		file_hash: file_hash
-		filename: filename
-		total_chunks: total_chunks
-	}
-} 
\ No newline at end of file
diff --git a/upload.v b/upload.v
index 08dfc72..5c6ce7c 100644
--- a/upload.v
+++ b/upload.v
@@ -227,10 +227,18 @@ pub fn (mut manager ChunkUploadManager) handle_chunk_upload(mut ctx Context) htt
 	return ctx.json('{"success": true, "chunk_index": $chunk_index, "all_chunk_uploaded": false, "message": "Chunk uploaded successfully"}')
 }
 
+// 合并请求结构
+pub struct MergeRequest {
+pub:
+	file_hash    string @[json: 'file_hash']
+	filename     string
+	total_chunks int    @[json: 'total_chunks']
+}
+
 // 处理分片合并
 pub fn (mut manager ChunkUploadManager) handle_chunk_merge(mut ctx Context) http.Response {
-	// 解析请求体
-	merge_request := hono.parse_merge_request(ctx.body) or {
+	// 使用 x.json2 解析请求体
+	merge_request := json2.decode[MergeRequest](ctx.body) or {
 		return ctx.bad_request('Invalid request body: ${err}')
 	}