Update turbowarp-server/qr-converter.py

turbowarp-server/qr-converter.py

@@ -19,6 +19,9 @@ def get_var(name):
     try:
         value = tw.get_variable(name=name, name_literal=False)
         
+        # デバッグ用に生の値を出力
+        print(f"[DEBUG] Raw value of '{name}': {value} (type: {type(value).__name__})")
+        
         # Noneの場合は"0"として扱う
         if value is None:
             print(f"[WARNING] Variable '{name}' is None, treating as '0'")
@@ -32,6 +35,7 @@ def get_var(name):
             value = str(value)
             print(f"[GET] Variable '{name}' converted from {type(value).__name__} to string: '{value}'")
         
+        # 表示用に切り詰め
         display_value = value[:50] + "..." if len(value) > 50 else value
         print(f"[GET] Variable '{name}' = '{display_value}'")
         return value
@@ -88,12 +92,13 @@ def decode_prompt(encoded_str):
     return decoded
 
 def rgb_to_scratch_number(rgb):
-    """RGBを0-999999の6桁の10進数に変換（RGB各2桁ではなく、6桁の数字）"""
+    """RGBを6桁の10進数に変換 (R:00-99, G:00-99, B:00-99)"""
     r, g, b = rgb
-    # RGBを1つの6桁の数字に変換（例: RGB(255,128,64) -> 255128064）
-    value = (r * 10000) + (g * 100) + b
-    # 6桁にゼロパディング
-    return f"{value:06d}"
+    # 各色を0-99の範囲に収める（元が0-255の場合）
+    r_scaled = int(r * 99 / 255)
+    g_scaled = int(g * 99 / 255)
+    b_scaled = int(b * 99 / 255)
+    return f"{r_scaled:02d}{g_scaled:02d}{b_scaled:02d}"
 
 def generate_image(prompt):
     """APIから352x352の画像生成"""
@@ -116,39 +121,49 @@ def generate_image(prompt):
     return img
 
 def resize_and_encode(img):
-    """90x90にリサイズして6桁の数字列に変換"""
+    """90x90にリサイズして6桁の数字列に変換（各ピクセル6桁）"""
     img = img.resize((90, 90))
     print("[INFO] Resized image to 90x90.")
     
     encoded = ""
+    total_pixels = 0
+    
     for y in range(90):
         for x in range(90):
-            encoded += rgb_to_scratch_number(img.getpixel((x, y)))
+            pixel = img.getpixel((x, y))
+            # RGB値を取得（RGBAの場合はRGBのみ使用）
+            if len(pixel) >= 3:
+                r, g, b = pixel[:3]
+            else:
+                r, g, b = pixel, pixel, pixel
+            encoded += rgb_to_scratch_number((r, g, b))
+            total_pixels += 1
     
-    expected_length = 90 * 90 * 6  # 8100 * 6 = 48600
-    print(f"[INFO] Image encoded to string of length {len(encoded)} (expected: {expected_length})")
+    expected_length = total_pixels * 6
+    print(f"[INFO] Encoded {total_pixels} pixels to string of length {len(encoded)} (expected: {expected_length})")
     return encoded
 
 def split_packets(data, max_length=9998):
-    """10000文字制限に合わせて分割（送信時の先頭 '10' を含むため、実質9998文字）"""
+    """10000文字制限に合わせて分割（先頭 '10' 含む）"""
     packets = []
     idx = 0
+    total_length = len(data)
+    expected_packets = (total_length + max_length - 1) // max_length
+    
     while idx < len(data):
         chunk = data[idx:idx + max_length]
         packets.append(chunk)
         idx += max_length
     
-    # パケット数の計算
-    total_packets = len(packets)
-    print(f"[INFO] Data split into {total_packets} packet(s).")
-    print(f"[INFO] Total data length: {len(data)}, Max per packet: {max_length}")
-    print(f"[INFO] Expected packets: {len(data) // max_length + (1 if len(data) % max_length else 0)}")
-    
+    print(f"[INFO] Data length: {total_length}, max packet size: {max_length}")
+    print(f"[INFO] Expected {expected_packets} packets, actual {len(packets)} packets")
     return packets
 
 # --- メインループ ---
 print("[INFO] Starting main loop...")
 last_processed_id = ""
+
+# 初期化
 set_var("n0", "0")
 set_var("n1", "0")
 time.sleep(1)
@@ -158,7 +173,11 @@ while True:
         n1 = get_var("n1")
         n0 = get_var("n0")
         
-        # n1が存在し、長さが3以上で、先頭が"0"（新規リクエスト）
+        print(f"[DEBUG] n0='{n0}', n1='{n1[:30]}...' if n1 and len(n1)>30 else n1")
+        
+        is_n0_free = (n0 == "0")
+        print(f"[DEBUG] is_n0_free: {is_n0_free}")
+        
         if n1 and len(n1) >= 3 and n1[0] == "0":
             user_id = n1[1:3]
             request_data = n1
@@ -166,67 +185,65 @@ while True:
             print(f"[INFO] Received request from user {user_id}")
             print(f"[INFO] Request data length: {len(request_data)}")
             
-            # 同じリクエストを繰り返し処理しないようにチェック
             if request_data == last_processed_id:
-                print("[INFO] Already processed this request, marking as read...")
+                print("[INFO] Already processed, marking as read...")
                 marked_as_read = "01" + request_data[2:]
                 set_var("n1", marked_as_read)
                 time.sleep(0.1)
                 continue
             
-            # n0が利用可能��チェック
-            if n0 == "0":
+            if is_n0_free:
                 print("[INFO] n0 is free, starting processing...")
                 
-                # 処理中フラグをセット
+                # 処理中フラグ
                 set_var("n0", "1")
                 
-                # リクエストを既読にする
+                # リクエストを既読に
                 marked_as_read = "01" + request_data[2:]
                 set_var("n1", marked_as_read)
                 
                 # プロンプトをデコード
                 encoded_prompt = request_data[3:]
+                print(f"[INFO] Encoded prompt length: {len(encoded_prompt)}")
                 prompt = decode_prompt(encoded_prompt)
                 print(f"[INFO] Decoded prompt: '{prompt}'")
                 
-                # 画像生成
+                # 画像生成とエンコード
                 img = generate_image(prompt)
                 scratch_data = resize_and_encode(img)
                 
-                # データサイズの確認
-                print(f"[INFO] Total image data size: {len(scratch_data)} characters")
-                print(f"[INFO] Expected packets: {len(scratch_data) // 9998 + (1 if len(scratch_data) % 9998 else 0)}")
-                
                 # パケット分割
-                packets = split_packets(scratch_data, max_length=9998)
+                packets = split_packets(scratch_data)
+                print(f"[INFO] Will send {len(packets)} packets")
                 
                 # パケット送信
                 for i, pkt in enumerate(packets):
                     packet_num = i + 1
                     print(f"[INFO] Sending packet {packet_num}/{len(packets)} (size: {len(pkt)} chars)")
+                    
+                    # パケット送信
                     set_var("n1", "10" + pkt)
                     
-                    if packet_num < len(packets):
-                        # 中間パケット: ACK '11' を待つ
-                        print(f"[INFO] Waiting for ACK '11' (packet {packet_num}/{len(packets)})...")
+                    if i < len(packets) - 1:
+                        # ACK待ち
+                        print(f"[INFO] Waiting for ACK for packet {packet_num}...")
                         ack_timeout = 0
                         ack_received = False
-                        while ack_timeout < 50:  # 5秒タイムアウト
+                        while ack_timeout < 50:
                             current_n1 = get_var("n1")
                             if current_n1 == "11":
-                                print("[INFO] Received ACK")
+                                print(f"[INFO] Received ACK for packet {packet_num}")
                                 ack_received = True
                                 break
-                            time.sleep(0.1)
+                            time.sleep(0.2)
                             ack_timeout += 1
                         
                         if not ack_received:
-                            print("[ERROR] ACK timeout")
+                            print(f"[ERROR] ACK timeout for packet {packet_num}")
                             set_var("n0", "0")
                             break
                     else:
-                        # 最終パケット: 完了 '99' を待つ
+                        # 完了待ち
                         print("[INFO] Waiting for completion '99'...")
                         complete_timeout = 0
                         complete_received = False
@@ -236,30 +253,29 @@ while True:
                                 print("[INFO] Received completion signal")
                                 complete_received = True
                                 break
-                            time.sleep(0.1)
+                            time.sleep(0.2)
                             complete_timeout += 1
                         
                         if not complete_received:
                             print("[ERROR] Completion timeout")
                 
-                # 完了後リセット
+                # 完了
                 print("[INFO] Transmission complete. Resetting n0.")
                 set_var("n0", "0")
                 last_processed_id = request_data
+                print(f"[INFO] Set last_processed_id")
                 
             else:
-                print(f"[INFO] n0 is busy (value: '{n0}'), waiting...")
+                print("[INFO] n0 is busy, waiting...")
         else:
-            if n1 and len(n1) >= 1:
-                print(f"[DEBUG] n1[0]='{n1[0]}', length={len(n1)}")
+            if n1:
+                print(f"[DEBUG] n1 condition not met: first char='{n1[0] if n1 else 'None'}', length={len(n1) if n1 else 0}")
             else:
-                print("[DEBUG] No valid request")
+                print("[DEBUG] n1 is None or empty")
             
     except Exception as e:
         print(f"[ERROR] Exception in main loop: {e}")
         import traceback
         traceback.print_exc()
-        # エラー時はn0をリセット
-        set_var("n0", "0")
     
-    time.sleep(0.2)
+    time.sleep(0.3)