Update turbowarp-server/qr-converter.py

turbowarp-server/qr-converter.py

@@ -19,9 +19,6 @@ 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'")
@@ -29,19 +26,18 @@ def get_var(name):
         
         # 様々な型を文字列に変換
         if isinstance(value, (int, float)):
-            value = str(int(value))  # 浮動小数点の場合は整数に変換してから文字列に
+            value = str(int(value))
             print(f"[GET] Variable '{name}' converted from number to string: '{value}'")
         elif not isinstance(value, str):
             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
     except Exception as e:
         print(f"[ERROR] Failed to get variable '{name}': {e}")
-        return "0"  # エラー時も"0"を返す
+        return "0"
 
 def set_var(name, value):
     try:
@@ -62,7 +58,7 @@ def encode_prompt(prompt):
     """プロンプト文字列を数字列にエンコード（半角スペースは96として特別処理）"""
     encoded = ""
     for char in prompt:
-        if char == " ":  # 半角スペースを特別に96として処理
+        if char == " ":
             encoded += "96"
         else:
             try:
@@ -80,7 +76,7 @@ def decode_prompt(encoded_str):
     i = 0
     while i < len(encoded_str):
         idx = int(encoded_str[i:i+2])
-        if idx == 96:  # 96は半角スペースとして扱う
+        if idx == 96:
             chars.append(" ")
         elif idx < len(n_chars):
             chars.append(n_chars[idx])
@@ -92,9 +88,12 @@ def decode_prompt(encoded_str):
     return decoded
 
 def rgb_to_scratch_number(rgb):
-    """RGBを0-999999の10進数に変換"""
+    """RGBを0-999999の6桁の10進数に変換（RGB各2桁ではなく、6桁の数字）"""
     r, g, b = rgb
-    return f"{r:03}{g:03}{b:03}"
+    # RGBを1つの6桁の数字に変換（例: RGB(255,128,64) -> 255128064）
+    value = (r * 10000) + (g * 100) + b
+    # 6桁にゼロパディング
+    return f"{value:06d}"
 
 def generate_image(prompt):
     """APIから352x352の画像生成"""
@@ -117,81 +116,77 @@ def generate_image(prompt):
     return img
 
 def resize_and_encode(img):
-    """90x90にリサイズして数字列に変換"""
+    """90x90にリサイズして6桁の数字列に変換"""
     img = img.resize((90, 90))
     print("[INFO] Resized image to 90x90.")
+    
     encoded = ""
     for y in range(90):
         for x in range(90):
             encoded += rgb_to_scratch_number(img.getpixel((x, y)))
-    print(f"[INFO] Image encoded to string of length {len(encoded)}.")
+    
+    expected_length = 90 * 90 * 6  # 8100 * 6 = 48600
+    print(f"[INFO] Image encoded to string of length {len(encoded)} (expected: {expected_length})")
     return encoded
 
 def split_packets(data, max_length=9998):
-    """10000文字制限に合わせて分割（先頭 '10' 含む）"""
+    """10000文字制限に合わせて分割（送信時の先頭 '10' を含むため、実質9998文字）"""
     packets = []
     idx = 0
     while idx < len(data):
         chunk = data[idx:idx + max_length]
         packets.append(chunk)
         idx += max_length
-    print(f"[INFO] Data split into {len(packets)} packet(s).")
+    
+    # パケット数の計算
+    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)}")
+    
     return packets
 
 # --- メインループ ---
 print("[INFO] Starting main loop...")
-last_processed_id = ""  # 最後に処理したIDを記録
-
-# 初期化時に変数をリセット
+last_processed_id = ""
 set_var("n0", "0")
 set_var("n1", "0")
-time.sleep(1)  # 設定が反映されるのを待つ
+time.sleep(1)
 
 while True:
     try:
-        # 変数を取得
         n1 = get_var("n1")
         n0 = get_var("n0")
         
-        # デバッグ情報
-        print(f"[DEBUG] n0='{n0}', n1='{n1[:30]}...' if n1 and len(n1)>30 else n1")
-        
-        # n0が利用可能かチェック（厳密な比較）
-        is_n0_free = (n0 == "0")
-        print(f"[DEBUG] is_n0_free: {is_n0_free}")
-        
         # n1が存在し、長さが3以上で、先頭が"0"（新規リクエスト）
         if n1 and len(n1) >= 3 and n1[0] == "0":
-            user_id = n1[1:3]  # ユーザーID（2桁）
-            request_data = n1  # 完全なリクエストデータ
+            user_id = n1[1:3]
+            request_data = n1
             
             print(f"[INFO] Received request from user {user_id}")
             print(f"[INFO] Request data length: {len(request_data)}")
-            print(f"[INFO] Request data preview: {request_data[:50]}...")
             
             # 同じリクエストを繰り返し処理しないようにチェック
             if request_data == last_processed_id:
                 print("[INFO] Already processed this request, marking as read...")
-                # 既読マークをつける（先頭を"01"に変更）
                 marked_as_read = "01" + request_data[2:]
                 set_var("n1", marked_as_read)
                 time.sleep(0.1)
                 continue
             
             # n0が利用可能かチェック
-            if is_n0_free:
+            if n0 == "0":
                 print("[INFO] n0 is free, starting processing...")
                 
                 # 処理中フラグをセット
                 set_var("n0", "1")
                 
-                # リクエストを既読にする（先頭を"01"に変更）
+                # リクエストを既読にする
                 marked_as_read = "01" + request_data[2:]
                 set_var("n1", marked_as_read)
                 
-                # プロンプトをデコード（先頭の"0" + ユーザーID(2桁)を除去）
+                # プロンプトをデコード
                 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}'")
                 
@@ -199,17 +194,22 @@ while True:
                 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)
+                packets = split_packets(scratch_data, max_length=9998)
                 
                 # パケット送信
                 for i, pkt in enumerate(packets):
-                    print(f"[INFO] Sending packet {i+1}/{len(packets)}")
+                    packet_num = i + 1
+                    print(f"[INFO] Sending packet {packet_num}/{len(packets)} (size: {len(pkt)} chars)")
                     set_var("n1", "10" + pkt)
                     
-                    if i < len(packets) - 1:
-                        # 次のパケットのACKを待つ
-                        print("[INFO] Waiting for ACK '11'...")
+                    if packet_num < len(packets):
+                        # 中間パケット: ACK '11' を待つ
+                        print(f"[INFO] Waiting for ACK '11' (packet {packet_num}/{len(packets)})...")
                         ack_timeout = 0
                         ack_received = False
                         while ack_timeout < 50:  # 5秒タイムアウト
@@ -218,7 +218,7 @@ while True:
                                 print("[INFO] Received ACK")
                                 ack_received = True
                                 break
-                            time.sleep(0.3)
+                            time.sleep(0.1)
                             ack_timeout += 1
                         
                         if not ack_received:
@@ -226,7 +226,7 @@ while True:
                             set_var("n0", "0")
                             break
                     else:
-                        # 最後のパケットは完了を待つ
+                        # 最終パケット: 完了 '99' を待つ
                         print("[INFO] Waiting for completion '99'...")
                         complete_timeout = 0
                         complete_received = False
@@ -236,7 +236,7 @@ while True:
                                 print("[INFO] Received completion signal")
                                 complete_received = True
                                 break
-                            time.sleep(0.3)
+                            time.sleep(0.1)
                             complete_timeout += 1
                         
                         if not complete_received:
@@ -245,21 +245,21 @@ while True:
                 # 完了後リセット
                 print("[INFO] Transmission complete. Resetting n0.")
                 set_var("n0", "0")
-                last_processed_id = request_data  # 処理済みとして記録
-                print(f"[INFO] Set last_processed_id to: {last_processed_id[:50]}...")
+                last_processed_id = request_data
                 
             else:
-                print("[INFO] n0 is busy, waiting...")
+                print(f"[INFO] n0 is busy (value: '{n0}'), waiting...")
         else:
-            # n1が条件を満たさない場合
-            if n1:
-                print(f"[DEBUG] n1 does not meet conditions: first char='{n1[0] if n1 else 'None'}', length={len(n1) if n1 else 0}")
+            if n1 and len(n1) >= 1:
+                print(f"[DEBUG] n1[0]='{n1[0]}', length={len(n1)}")
             else:
-                print("[DEBUG] n1 is None or empty")
+                print("[DEBUG] No valid request")
             
     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.5)  # 少し長めの待機時間
+    time.sleep(0.2)