Update app.py

app.py

@@ -3,94 +3,22 @@ import time
 import os
 import random
 import requests
+import ssl
 from flask import Flask
-import scratchconnect
+import scratchattach as sa
+import websocket
 
 # ==================== CONFIGURATION ====================
-# Read environment variables set in Hugging Face Secrets
 SCRATCH_USER = os.environ.get("SCRATCH_USER")
 SCRATCH_PASS = os.environ.get("SCRATCH_PASS")
 PROJECT_ID = int(os.environ.get("PROJECT_ID", 0))
 AI_URL = "https://16dvnk-spirit-kings-ai.hf.space/generate"
 
-# ==================== PROXY LIST ====================
-PROXY_LIST = [
-    "http://8.219.97.248:80",
-    "http://38.158.83.233:999",
-    "http://102.68.128.216:8080",
-    "http://8.243.126.136:8801",
-    "http://45.236.66.163:8520",
-    "http://103.155.167.62:8080",
-    "http://119.92.71.40:8080",
-    "http://103.144.146.5:8080",
-    "http://36.91.220.132:8080",
-    "http://41.254.48.192:1976",
-    "http://45.169.169.14:8085",
-    "http://103.3.246.71:3128",
-    "http://185.225.40.236:8080",
-    "http://164.90.151.28:3128",
-    "http://177.234.211.31:999",
-    "http://38.156.73.61:8080",
-    "http://103.68.214.135:8181",
-    "http://169.255.77.150:9999",
-    "http://35.225.22.61:80",
-    "http://103.125.174.233:7777",
-    "http://103.171.83.115:7777",
-    "http://84.247.149.172:3128",
-    "http://51.79.135.131:8080",
-    "http://186.148.184.18:999",
-    "http://116.80.64.157:7777",
-    "http://116.80.64.158:7777",
-    "http://116.80.48.217:7777",
-    "http://116.0.54.25:8080",
-    "http://116.80.95.238:7777",
-    "http://142.171.157.207:3128",
-    "http://154.119.80.27:3128",
-    "http://103.82.93.98:3128",
-    "http://104.248.81.109:3128",
-    "http://194.163.183.242:3128",
-    "http://49.144.17.15:8082",
-    "http://103.170.22.44:8080",
-    "http://160.22.234.4:1111",
-    "http://116.80.49.156:3172",
-    "http://116.80.49.163:3172",
-    "http://116.80.96.95:3172",
-    "http://116.80.96.100:3172",
-    "http://116.80.96.107:3172",
-    "http://116.80.65.77:3172",
-    "http://45.136.198.40:3128",
-    "http://130.61.139.145:3128",
-    "http://116.80.63.64:7777",
-    "http://150.95.26.146:7080",
-    "http://116.80.96.103:3172",
-    "http://20.2.83.243:3128",
-    "http://165.232.146.249:3128",
-    "http://199.68.217.2:3128",
-    "http://116.80.65.75:3172",
-    "http://116.80.65.78:3172",
-    "http://116.80.65.81:3172",
-    "http://116.80.65.85:3172",
-    "http://45.119.85.216:3128",
-    "http://192.232.48.2:8181",
-    "http://116.80.65.82:3172",
-    "http://95.213.217.168:52004",
-    "http://174.140.109.250:3128",
-    "http://185.118.51.163:3128",
-    "http://46.175.148.17:2040",
-    "http://42.96.16.158:1311",
-    "http://103.30.31.209:32323",
-    "http://45.131.6.46:80",
-    "http://172.67.70.113:80",
-    "http://103.21.244.88:80",
-    "http://103.21.244.43:80",
-    "http://103.21.244.189:80",
-    "http://103.21.244.186:80",
-    "http://103.21.244.165:80",
-    "http://103.21.244.150:80",
-    "http://103.21.244.210:80",
-    "http://173.245.49.114:80",
-    "http://103.21.244.12:80",
-    "http://178.130.47.129:1082"
+# Scratch cloud WebSocket IP addresses (from your dig output)
+SCRATCH_CLOUD_IPS = [
+    "16.144.201.211",
+    "54.69.147.69",
+    "44.230.13.252"
 ]
 
 # ==================== ENCODING/DECODING ====================
@@ -123,81 +51,81 @@ def decode_text(encoded):
             i += 1
     return "".join(result)
 
-# ==================== PROXY ROTATOR ====================
-class ProxyRotator:
-    def __init__(self, proxies):
-        self.proxies = proxies
-        self.current_index = 0
-        self.failed_proxies = set()
-    
-    def get_next_proxy(self):
-        if len(self.failed_proxies) >= len(self.proxies):
-            self.failed_proxies.clear()
-        attempts = 0
-        while attempts < len(self.proxies):
-            proxy = self.proxies[self.current_index % len(self.proxies)]
-            self.current_index += 1
-            if proxy not in self.failed_proxies:
-                return {"http": proxy, "https": proxy}
-        self.failed_proxies.clear()
-        proxy = self.proxies[self.current_index % len(self.proxies)]
-        self.current_index += 1
-        return {"http": proxy, "https": proxy}
-    
-    def mark_proxy_failed(self, proxy_url):
-        if isinstance(proxy_url, dict):
-            proxy_url = proxy_url.get("http", "")
-        self.failed_proxies.add(proxy_url)
-
-proxy_rotator = ProxyRotator(PROXY_LIST)
-
-# ==================== AI CALL WITH PROXY ROTATION ====================
-def call_ai(prompt):
-    for attempt in range(len(PROXY_LIST)):
-        proxy = proxy_rotator.get_next_proxy()
-        try:
-            response = requests.post(AI_URL, json={"prompt": prompt}, proxies=proxy, timeout=30)
-            if response.status_code == 200:
-                return response.json().get("response", "Sorry, no response.")
-            else:
-                proxy_rotator.mark_proxy_failed(proxy)
-        except Exception as e:
-            proxy_rotator.mark_proxy_failed(proxy)
-    try:
-        response = requests.post(AI_URL, json={"prompt": prompt}, timeout=30)
-        if response.status_code == 200:
-            return response.json().get("response", "Sorry, no response.")
-    except:
-        pass
-    return "Error: Could not reach AI service."
+# ==================== FORCE IP FOR WEBSOCKET ====================
+def patch_scratchattach_websocket():
+    """Monkey-patch scratchattach to use IP address with custom Host header."""
+    # Pick a random working IP from the list
+    working_ip = random.choice(SCRATCH_CLOUD_IPS)
+    new_cloud_host = f"wss://{working_ip}/"
+
+    # Save original CloudConnection class and its connect method
+    from scratchattach import CloudConnection
+    original_connect = CloudConnection.connect
+
+    def patched_connect(self, *args, **kwargs):
+        # Override the cloud host for this instance
+        self.CLOUD_HOST = new_cloud_host
+        # Create WebSocket with custom Host header and disabled SSL verification
+        self.ws = websocket.WebSocket(sslopt={"cert_reqs": ssl.CERT_NONE})
+        self.ws.connect(
+            self.CLOUD_HOST,
+            header=[f"Host: clouddata.scratch.mit.edu"],
+            http_proxy_host=None,
+            http_proxy_port=None
+        )
+        self.ws.sock.setblocking(0)
+        # Send handshake
+        handshake = {"method": "handshake", "project_id": str(self.project_id)}
+        if self.user:
+            handshake["user"] = self.user
+        if self.project_token:
+            handshake["project_token"] = self.project_token
+        self.ws.send(sa.json.dumps(handshake))
+        response = self.ws.recv()
+        data = sa.json.loads(response)
+        self.session_id = data["session_id"]
+        self.project_id = data["project_id"]
+        self.user = data.get("user")
+        self.permissions = data.get("permissions", {})
+        self.ws.settimeout(None)
+
+    # Apply the patch
+    CloudConnection.connect = patched_connect
+    print(f"[PATCH] CloudConnection patched to use {new_cloud_host}")
 
 # ==================== BRIDGE WORKER ====================
 def bridge_worker():
-    print("[BRIDGE] Starting bridge with proxy rotation...")
-    
+    print("[BRIDGE] Starting bridge...")
+    patch_scratchattach_websocket()
+
     while True:
         try:
             print("[BRIDGE] Logging into Scratch...")
-            user = scratchconnect.ScratchConnect(SCRATCH_USER, SCRATCH_PASS)
-            print("[BRIDGE] Login successful. Connecting to project...")
-            project = user.connect_project(project_id=PROJECT_ID)
-            print("[BRIDGE] Project connected. Connecting to cloud variables...")
-            cloud = project.connect_cloud_variables()
-            print("[BRIDGE] Cloud connection established. Waiting for prompts...")
+            session = sa.login(SCRATCH_USER, SCRATCH_PASS)
+            print("[BRIDGE] Login successful. Connecting to cloud variables...")
+            conn = session.connect_cloud(PROJECT_ID)
+            print(f"[BRIDGE] Connected to project {PROJECT_ID}")
 
             last_prompt = ""
             while True:
-                prompt_history = cloud.get_cloud_variable_value(variable_name="prompt")
-                current = prompt_history[0] if prompt_history else "0"
+                # Get current prompt value
+                current = conn.get_var("prompt")
+                if current is None:
+                    current = "0"
                 if current != last_prompt and current != "0":
                     print(f"[BRIDGE] New prompt: {current}")
                     decoded = decode_text(current)
                     print(f"[BRIDGE] Decoded: {decoded}")
-                    ai_response = call_ai(decoded)
+
+                    # AI response (direct call, no proxy)
+                    response = requests.post(AI_URL, json={"prompt": decoded}, timeout=30)
+                    ai_response = response.json().get("response", "Sorry, no response.") if response.status_code == 200 else f"Error {response.status_code}"
                     print(f"[BRIDGE] AI response: {ai_response[:100]}...")
+
                     encoded_response = encode_text(ai_response)
-                    cloud.set_cloud_variable(variable_name="response", value=encoded_response)
+                    conn.set_var("response", encoded_response)
                     print("[BRIDGE] Response sent to Scratch")
+
                     last_prompt = current
                 time.sleep(1)
         except Exception as e:
@@ -212,7 +140,7 @@ app = Flask(__name__)
 
 @app.route('/')
 def health():
-    return "Scratch AI Bridge is running with proxy rotation."
+    return "Scratch AI Bridge is running."
 
 if __name__ == '__main__':
     print("[MAIN] Starting bridge thread...")