Update turbowarp-server/qr-converter.py

turbowarp-server/qr-converter.py

@@ -4,51 +4,63 @@ import scratchcommunication
 
 PROJECT_ID = 1293030706
 
+# Scratchクラウド接続
 tw = scratchcommunication.TwCloudConnection(
     project_id=PROJECT_ID,
     username="server",
     contact_info="contact",
     reconnect=True,
-    receive_from_websocket=True
+    receive_from_websocket=True,
+    accept_strs=True  # 文字列も取得可能
 )
 
+# short_id を a-z0-9 → 00~35 に変換
 def encode_short_id(short_id):
     chars = "abcdefghijklmnopqrstuvwxyz0123456789"
     result = ""
-    for c in short_id:
-        index = chars.index(c)
-        result += f"{index:02d}"
+    for c in short_id.lower():  # 念のため小文字化
+        if c in chars:
+            result += f"{chars.index(c):02d}"
+        else:
+            result += "00"  # 不明文字は00
     return result
 
 last_n1 = None
 
 while True:
     try:
-        n1_raw = tw.get_variable(name="n1")
-        n1 = str(n1_var.value)  # '☁ n1' 対策
+        # クラウド変数 n1 の取得
+        n1 = tw.get_variable(name="n1", name_literal=False)
+        if n1 is None:
+            time.sleep(0.2)
+            continue
+        n1 = str(n1).strip()
 
         if n1 != last_n1:
             last_n1 = n1
 
             if len(n1) < 3:
-                continue
+                continue  # 3桁以上ない場合はスキップ
 
-            mode = n1[0]
-            read_flag = n1[1]
+            mode = n1[0]        # 0: 受信/送信待ち, 1: レスポンス返却
+            read_flag = n1[1]   # 0: 未読, 1: 既読
+            content = n1[2:]    # 3桁目以降 = ID
 
+            # -----------------------------
+            # Scratch → サーバー
+            # -----------------------------
             if mode == "0" and read_flag == "0":
+                # 使用中フラグ
                 tw.set_variable(name="n0", value=1)
+                print("受信ID:", content)
 
-                recv_id = n1[2:]
-                print("受信ID:", recv_id)
-
-                # 既読にする
-                tw.set_variable(name="n1", value="0" + "1" + recv_id)
+                # 既読に変更
+                tw.set_variable(name="n1", value="0" + "1" + content)
 
                 # APIアクセス
-                url = f"https://20.rf.gd/set.php?project_id={recv_id}"
+                url = f"https://20.rf.gd/set.php?project_id={content}"
                 try:
-                    res = requests.get(url, cookies={"__test": "872039d283902860e895efb6018d2632"}, timeout=5)
+                    res = requests.get(url, timeout=5)
                     res.raise_for_status()
                     data = res.json()
                     short_id = data.get("short_id", "000")
@@ -63,12 +75,15 @@ while True:
 
                 encoded = encode_short_id(short_id)
 
-                # レスポンス書き込み
+                # サーバー → Scratch にレスポンス書き込み
                 tw.set_variable(name="n1", value="1" + "0" + encoded)
 
+            # -----------------------------
+            # Scratch が既読にしたら n0 を解放
+            # -----------------------------
             elif mode == "1" and read_flag == "1":
                 tw.set_variable(name="n0", value=0)
-                print("完了")
+                print("通信完了。n0を0に戻しました。")
 
         time.sleep(0.2)