Update turbowarp-server/qr-converter.py

turbowarp-server/qr-converter.py

@@ -19,38 +19,29 @@ 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'")
             return "0"
         
         # 様々な型を文字列に変換
         if isinstance(value, (int, float)):
-            value = str(int(value))  # 浮動小数点の場合は整数に変換してから文字列に
-            print(f"[GET] Variable '{name}' converted from number to string: '{value}'")
+            value = str(int(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:
         tw.set_variable(name=name, value=value, name_literal=False)
-        print(f"[SET] Variable '{name}' = '{value[:50]}...'" if len(value) > 50 else f"[SET] Variable '{name}' = '{value}'")
+        print(f"[SET] {name} = {value[:50]}..." if len(value) > 50 else f"[SET] {name} = {value}")
         return True
     except Exception as e:
         print(f"[ERROR] Failed to set variable '{name}': {e}")
-        return None
+        return False
 
 # --- n-chars.txt の読み込み ---
 print("[INFO] Loading n-chars.txt...")
@@ -58,22 +49,6 @@ with open("turbowarp-server/n-chars.txt", "r", encoding="utf-8") as f:
     n_chars = [line.strip() for line in f]
 print(f"[INFO] Loaded {len(n_chars)} characters.")
 
-def encode_prompt(prompt):
-    """プロンプト文字列を数字列にエンコード（半角スペースは96として特別処理）"""
-    encoded = ""
-    for char in prompt:
-        if char == " ":  # 半角スペースを特別に96として処理
-            encoded += "96"
-        else:
-            try:
-                idx = n_chars.index(char)
-                encoded += f"{idx:02d}"
-            except ValueError:
-                print(f"[WARNING] Character '{char}' not found in n_chars, skipping")
-                continue
-    print(f"[ENCODE] Prompt encoded to length {len(encoded)}")
-    return encoded
-
 def decode_prompt(encoded_str):
     """クラウド変数の数字列を元にプロンプト文字列に復号（96は半角スペースとして処理）"""
     chars = []
@@ -88,7 +63,7 @@ def decode_prompt(encoded_str):
             print(f"[WARNING] Invalid index {idx} at position {i}")
         i += 2
     decoded = "".join(chars)
-    print(f"[DECODE] Encoded prompt -> '{decoded[:50]}...'")
+    print(f"[DECODE] Prompt: '{decoded[:50]}...'")
     return decoded
 
 def rgb_to_scratch_number(rgb):
@@ -113,153 +88,134 @@ def generate_image(prompt):
     resp = requests.get("https://izuemon-pixart-alpha-pixart-sigma-xl-2-1024-ms.hf.space/gen", params=params)
     resp.raise_for_status()
     img = Image.open(BytesIO(resp.content))
-    print(f"[INFO] Image generated: size={img.size}, mode={img.mode}")
+    print(f"[INFO] Image generated: size={img.size}")
     return img
 
 def resize_and_encode(img):
     """90x90にリサイズして数字列に変換"""
     img = img.resize((90, 90))
-    print("[INFO] Resized image to 90x90.")
+    print("[INFO] Resized 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)}.")
+    print(f"[INFO] Encoded length: {len(encoded)}")
     return encoded
 
 def split_packets(data, max_length=9998):
-    """10000文字制限に合わせて分割（先頭 '10' 含む）"""
+    """10000文字制限に合わせて分割"""
     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).")
+    print(f"[INFO] Split into {len(packets)} packets")
     return packets
 
+def wait_for_signal(expected_value, timeout_seconds=5):
+    """特定のシグナルを待つ"""
+    start_time = time.time()
+    while time.time() - start_time < timeout_seconds:
+        current = get_var("n1")
+        if current == expected_value:
+            return True
+        time.sleep(0.1)
+    return False
+
 # --- メインループ ---
 print("[INFO] Starting main loop...")
-last_processed_id = ""  # 最後に処理したIDを記録
+last_processed_id = ""
 
-# 初期化時に変数をリセット
+# 初期化
 set_var("n0", "0")
 set_var("n1", "0")
-time.sleep(1)  # 設定が反映されるのを待つ
+set_var("n2", "0")  # データ送信用の変数を追加
 
 while True:
     try:
-        # 変数を取得
-        n1 = get_var("n1")
         n0 = get_var("n0")
+        n1 = get_var("n1")
         
-        # デバッグ情報
-        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"（新規リクエスト）
+        # 新規リクエストの確認（n1が"0"で始まり、長さが3以上）
         if n1 and len(n1) >= 3 and n1[0] == "0":
-            user_id = n1[1:3]  # ユーザーID（2桁）
-            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]}...")
+            request_data = n1
+            user_id = n1[1:3]
             
-            # 同じリクエストを繰り返し処理しないようにチェック
+            # 重複チェック
             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)
+                print(f"[INFO] Duplicate request from user {user_id}, marking as read")
+                set_var("n1", "01" + request_data[2:])
+                time.sleep(0.2)
                 continue
             
-            # n0が利用可能かチェック
-            if is_n0_free:
-                print("[INFO] n0 is free, starting processing...")
+            # n0が空いているか確認
+            if n0 == "0":
+                print(f"[INFO] Processing request from user {user_id}")
                 
-                # 処理中フラグをセット
+                # 処理中フラグを立てる
                 set_var("n0", "1")
                 
-                # リクエストを既読にする（先頭を"01"に変更）
-                marked_as_read = "01" + request_data[2:]
-                set_var("n1", marked_as_read)
+                # リクエストを既読にする
+                set_var("n1", "01" + request_data[2:])
                 
-                # プロンプトをデコード（先頭の"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}'")
                 
-                # 画像生成
-                img = generate_image(prompt)
-                scratch_data = resize_and_encode(img)
-                
-                # パケット分割
-                packets = split_packets(scratch_data)
-                
-                # パケット送信
-                for i, pkt in enumerate(packets):
-                    print(f"[INFO] Sending packet {i+1}/{len(packets)}")
-                    set_var("n1", "10" + pkt)
+                # 画像生成とエンコード
+                try:
+                    img = generate_image(prompt)
+                    scratch_data = resize_and_encode(img)
+                    packets = split_packets(scratch_data)
                     
-                    if i < len(packets) - 1:
-                        # 次のパケットのACKを待つ
-                        print("[INFO] Waiting for ACK '11'...")
-                        ack_timeout = 0
-                        ack_received = False
-                        while ack_timeout < 50:  # 5秒タイムアウト
-                            current_n1 = get_var("n1")
-                            if current_n1 == "11":
-                                print("[INFO] Received ACK")
-                                ack_received = True
-                                break
-                            time.sleep(0.3)
-                            ack_timeout += 1
+                    # パケット送信
+                    success = True
+                    for i, pkt in enumerate(packets):
+                        print(f"[INFO] Sending packet {i+1}/{len(packets)}")
+                        
+                        # n2にデータを送信
+                        packet_data = f"{i+1:02d}{len(packets):02d}" + pkt
+                        set_var("n2", packet_data)
                         
-                        if not ack_received:
-                            print("[ERROR] ACK timeout")
-                            set_var("n0", "0")
+                        # クライアントからのACKを待つ（n1が"11"になるのを待つ）
+                        if not wait_for_signal("11", timeout_seconds=10):
+                            print(f"[ERROR] ACK timeout for packet {i+1}")
+                            success = False
                             break
-                    else:
-                        # 最後のパケットは完了を待つ
-                        print("[INFO] Waiting for completion '99'...")
-                        complete_timeout = 0
-                        complete_received = False
-                        while complete_timeout < 50:
-                            current_n1 = get_var("n1")
-                            if current_n1 == "99":
-                                print("[INFO] Received completion signal")
-                                complete_received = True
-                                break
-                            time.sleep(0.3)
-                            complete_timeout += 1
                         
-                        if not complete_received:
+                        # ACKを受信したらn1をリセット
+                        set_var("n1", "0")
+                        print(f"[INFO] ACK received for packet {i+1}")
+                    
+                    if success:
+                        # 完了シグナルを待つ
+                        print("[INFO] Waiting for completion signal...")
+                        if wait_for_signal("99", timeout_seconds=10):
+                            print("[INFO] Completion received")
+                            set_var("n1", "0")
+                        else:
                             print("[ERROR] Completion timeout")
+                    
+                    # 処理完了
+                    last_processed_id = request_data
+                    
+                except Exception as e:
+                    print(f"[ERROR] Image processing failed: {e}")
+                    import traceback
+                    traceback.print_exc()
                 
-                # 完了後リセット
-                print("[INFO] Transmission complete. Resetting n0.")
+                # n0を解放
                 set_var("n0", "0")
-                last_processed_id = request_data  # 処理済みとして記録
-                print(f"[INFO] Set last_processed_id to: {last_processed_id[:50]}...")
+                print("[INFO] Processing complete, n0 released")
                 
             else:
-                print("[INFO] n0 is busy, 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}")
-            else:
-                print("[DEBUG] n1 is None or empty")
-            
+                print(f"[INFO] n0 is busy, waiting...")
+        
+        time.sleep(0.1)
+        
     except Exception as e:
-        print(f"[ERROR] Exception in main loop: {e}")
+        print(f"[ERROR] Main loop error: {e}")
         import traceback
         traceback.print_exc()
-    
-    time.sleep(0.5)  # 少し長めの待機時間
+        time.sleep(1)