修复2进制文件dfpwm被视为文本传输的问题

Client/main.lua

@@ -21,6 +21,84 @@ local function log(msg)
   --basalt.debug("[FileClient] " .. tostring(msg))
 end
 
+-- 改进的二进制检测函数，增加对DFPWM等特定格式的支持
+local function isBinaryFile(path)
+    local extension = string.lower(string.match(path, "%.([^%.%s]+)$") or "")
+    local binaryExtensions = {
+        ["wav"] = true,
+        ["mp3"] = true,
+        ["ogg"] = true,
+        ["flac"] = true,
+        ["dfpwm"] = true,
+        ["png"] = true,
+        ["jpg"] = true,
+        ["jpeg"] = true,
+        ["gif"] = true,
+        ["bmp"] = true,
+        ["ico"] = true,
+        ["exe"] = true,
+        ["dll"] = true,
+        ["so"] = true,
+        ["bin"] = true,
+        ["dat"] = true,
+        ["zip"] = true,
+        ["rar"] = true,
+        ["tar"] = true,
+        ["gz"] = true,
+        ["pdf"] = true,
+        ["doc"] = true,
+        ["docx"] = true,
+        ["xls"] = true,
+        ["xlsx"] = true,
+        ["ppt"] = true,
+        ["pptx"] = true
+    }
+    
+    if binaryExtensions[extension] then
+        return true
+    end
+    
+    -- 对于没有扩展名的文件，检查内容
+    local absPath = path
+    if not fs.exists(absPath) then
+        return false
+    end
+    
+    local ok, handle = pcall(fs.open, absPath, "rb")
+    if not ok or not handle then
+        return false
+    end
+    
+    local data = handle.read(math.min(1024, fs.getSize(absPath)))
+    handle.close()
+    
+    if not data then
+        return false
+    end
+    
+    -- 检查是否存在控制字符（除常见的空白字符外）
+    for i = 1, #data do
+        local b = data:byte(i)
+        -- 控制字符范围是 0-8, 11-12, 14-31, 127
+        if (b >= 0 and b <= 8) or (b == 11) or (b == 12) or (b >= 14 and b <= 31) or (b == 127) then
+            -- 如果控制字符过多（超过5%），则认为是二进制文件
+            local controlCount = 0
+            for j = 1, #data do
+                local byte = data:byte(j)
+                if (byte >= 0 and byte <= 8) or (byte == 11) or (byte == 12) or (byte >= 14 and byte <= 31) or (byte == 127) then
+                    controlCount = controlCount + 1
+                end
+            end
+            
+            if controlCount / #data > 0.05 then
+                return true
+            end
+        end
+    end
+    
+    return false
+end
+
 function table_to_json(t, indent)
     indent = indent or 0
     local spaces = string.rep(" ", indent)
@@ -114,7 +192,7 @@ local function httpPost(path, data)
     local jsonData = table_to_json(data)
     local url = httpServer .. path
   
-    -- 使用长轮询，设置超时时间为300秒
+    -- 使用长轮询
     local response,err = http.post({
         url = url,
         body = jsonData,
@@ -122,7 +200,7 @@ local function httpPost(path, data)
         headers = {
             ["Content-Type"] = "application/json"
         },
-        timeout = 300  -- 300秒超时
+        timeout = 60
     })
   
     if not response then
@@ -141,16 +219,6 @@ local function httpPost(path, data)
 end
 
 -- ========== 文件系统操作 ==========
-local function isLikelyText(data)
-    for i = 1, math.min(#data, 1024) do
-        local b = data:byte(i)
-        if b < 32 and b ~= 9 and b ~= 10 and b ~= 13 then
-            return false
-        end
-    end
-    return true
-end
-
 local function getFiles(currentPath, result, prefix)
     local computerPrefix = "computer_" .. computerID
     local fullPrefix = currentPath == "" and prefix:sub(1, -2) or prefix .. currentPath
@@ -165,15 +233,16 @@ local function getFiles(currentPath, result, prefix)
         end
     else
         local content = "[binary]"
-        local ok, handle = pcall(fs.open, absPath, "rb")
-        if ok and handle then
-            local data = handle.readAll()
-            handle.close()
-            if data and isLikelyText(data) then
-                content = data
+        if not isBinaryFile(absPath) then
+            local ok, handle = pcall(fs.open, absPath, "r")
+            if ok and handle then
+                local data = handle.readAll()
+                handle.close()
+                content = data or ""
             end
         end
-        result[fullPrefix] = { isFile = true, content = content }
+        
+        result[fullPrefix] = { isFile = true, content = content, isBinary = isBinaryFile(absPath) }
     end
 end
 
@@ -399,4 +468,4 @@ local function main()
 end
 
 -- 启动主逻辑和Basalt事件循环
-parallel.waitForAll(basalt.autoUpdate, main)
+parallel.waitForAll(basalt.autoUpdate, main)

PyServer/main.py

@@ -48,6 +48,18 @@ class Room:
             'created_at': self.created_at.isoformat()
         }
 
+def safe_decode_json(raw_body: bytes) -> Dict[Any, Any]:
+    """
+    尝试用 UTF-8 解码，失败则尝试 GB18030（兼容 GBK/GB2312）
+    """
+    for encoding in ['utf-8', 'gb18030', 'latin1']:
+        try:
+            text = raw_body.decode(encoding)
+            return json.loads(text)
+        except (UnicodeDecodeError, json.JSONDecodeError):
+            continue
+    raise ValueError("无法解码请求体为有效 JSON")
+
 def get_frontend_to_client_queue(room_id: str) -> List[Dict[str, Any]]:
     if room_id not in frontend_to_client_queues:
         frontend_to_client_queues[room_id] = []
@@ -88,35 +100,31 @@ class HTTPHandler:
             return web.json_response({'error': str(e)}, status=500)
 
     async def handle_frontend_send_message(self, request):
-        """前端发送消息到客户端"""
         try:
-            data = await request.json()
+            raw_body = await request.read()
+            data = safe_decode_json(raw_body)
             room_id = data.get('room_id')
             message_data = data.get('message')
-          
+
             if not room_id or not message_data:
                 return web.json_response({'error': '需要room_id和message参数'}, status=400)
-          
+
             queue = get_frontend_to_client_queue(room_id)
             queue.append(message_data)
-            
-            # 检查是否有挂起的客户端请求并立即响应
             if room_id in pending_requests and 'client' in pending_requests[room_id]:
                 client_req_id = pending_requests[room_id]['client']
                 if client_req_id in pending_requests:
                     pending_requests[client_req_id]['event'].set()
                     logger.info(f"立即响应挂起的客户端请求: {client_req_id}")
-          
-            response = {
+
+            return web.json_response({
                 'success': True,
                 'message': '消息已发送到客户端队列'
-            }
-          
-            return web.json_response(response)
-          
-        except json.JSONDecodeError:
-            logger.error("JSON解析失败")
-            return web.json_response({'error': '无效的JSON数据'}, status=400)
+            })
+
+        except ValueError as e:
+            logger.error(f"前端发送消息失败: 无效的JSON或编码错误 - {e}")
+            return web.json_response({'error': '无效的JSON数据或不支持的文本编码'}, status=400)
         except Exception as e:
             logger.error(f"前端发送消息失败: {e}")
             return web.json_response({'error': str(e)}, status=500)
@@ -204,35 +212,32 @@ class HTTPHandler:
             return web.json_response({'error': str(e)}, status=500)
 
     async def handle_client_send_message(self, request):
-        """客户端发送消息到前端"""
         try:
-            data = await request.json()
+            raw_body = await request.read()  # 获取原始字节
+            data = safe_decode_json(raw_body)
             room_id = data.get('room_id')
             message_data = data.get('message')
-          
+
             if not room_id or not message_data:
                 return web.json_response({'error': '需要room_id和message参数'}, status=400)
-          
+
             queue = get_client_to_frontend_queue(room_id)
             queue.append(message_data)
-            
-            # 检查是否有挂起的前端请求并立即响应
+
             if room_id in pending_requests and 'frontend' in pending_requests[room_id]:
                 frontend_req_id = pending_requests[room_id]['frontend']
                 if frontend_req_id in pending_requests:
                     pending_requests[frontend_req_id]['event'].set()
                     logger.info(f"立即响应挂起的前端请求: {frontend_req_id}")
-          
-            response = {
+
+            return web.json_response({
                 'success': True,
                 'message': '消息已发送到前端队列'
-            }
-          
-            return web.json_response(response)
-          
-        except json.JSONDecodeError:
-            logger.error("JSON解析失败")
-            return web.json_response({'error': '无效的JSON数据'}, status=400)
+            })
+
+        except ValueError as e:
+            logger.error(f"客户端发送消息失败: 无效的JSON或编码错误 - {e}")
+            return web.json_response({'error': '无效的JSON数据或不支持的文本编码'}, status=400)
         except Exception as e:
             logger.error(f"客户端发送消息失败: {e}")
             return web.json_response({'error': str(e)}, status=500)
@@ -240,12 +245,13 @@ class HTTPHandler:
     async def handle_client_receive_message(self, request):
         """客户端接收来自前端的消息（长轮询）"""
         try:
-            data = await request.json()
+            raw_body = await request.read()
+            data = safe_decode_json(raw_body)  # 使用你之前添加的 safe_decode_json
             room_id = data.get('room_id')
-          
+        
             if not room_id:
                 return web.json_response({'error': '需要room_id参数'}, status=400)
-          
+        
             queue = get_frontend_to_client_queue(room_id)
             
             # 立即检查是否有消息
@@ -257,7 +263,7 @@ class HTTPHandler:
                 }
                 return web.json_response(response)
             
-            # 没有消息，设置长轮询
+            # 没有消息，设置长轮询（最多等待 58 秒）
             req_id = str(uuid.uuid4())
             event = asyncio.Event()
             
@@ -274,10 +280,10 @@ class HTTPHandler:
             pending_requests[room_id]['client'] = req_id
             
             try:
-                # 等待295秒或直到有消息
-                await asyncio.wait_for(event.wait(), timeout=295)
+                # ⏱️ 只等待 58 秒（略小于客户端或代理的 60 秒超时）
+                await asyncio.wait_for(event.wait(), timeout=58)
                 
-                # 检查队列中是否有消息
+                # 被唤醒后，检查队列
                 queue = get_frontend_to_client_queue(room_id)
                 if queue:
                     message = queue.pop(0)
@@ -286,37 +292,36 @@ class HTTPHandler:
                         'message': message
                     }
                 else:
-                    # 超时返回空消息
                     response = {
                         'success': True,
                         'message': None
                     }
                     
             except asyncio.TimeoutError:
-                # 超时返回空消息
+                # 58秒超时，返回空消息
                 response = {
                     'success': True,
                     'message': None
                 }
             
             # 清理挂起的请求
-            if req_id in pending_requests:
-                del pending_requests[req_id]
-            if room_id in pending_requests and 'client' in pending_requests[room_id]:
-                del pending_requests[room_id]['client']
+            pending_requests.pop(req_id, None)
+            if room_id in pending_requests:
+                pending_requests[room_id].pop('client', None)
+                # 如果 room_id 下已无其他引用，也可以清理整个 room 条目（可选）
                 
             return web.json_response(response)
-          
-        except json.JSONDecodeError:
-            logger.error("JSON解析失败")
+        
+        except ValueError as e:
+            logger.error(f"客户端接收消息失败: 无效JSON或编码 - {e}")
             return web.json_response({'error': '无效的JSON数据'}, status=400)
         except Exception as e:
             logger.error(f"客户端接收消息失败: {e}")
             # 清理挂起的请求
-            if 'req_id' in locals() and req_id in pending_requests:
-                del pending_requests[req_id]
-            if room_id in pending_requests and 'client' in pending_requests[room_id]:
-                del pending_requests[room_id]['client']
+            if 'req_id' in locals():
+                pending_requests.pop(req_id, None)
+            if 'room_id' in locals() and room_id in pending_requests:
+                pending_requests[room_id].pop('client', None)
             return web.json_response({'error': str(e)}, status=500)
 
     async def handle_static_file(self, request):