Update SpaceFace.py

SpaceFace.py

@@ -3,19 +3,23 @@ import scratchattach as scratch3
 import threading
 import time
 import random
+import os
 global conn
 global projectid
 global endpoint
 global users
+projectid = os.getenv("ProjectID")
 users = {}
-with open("password.txt") as f:
-    session = scratch3.login("PolyPenguin", f.read())
+session = scratch3.login(os.getenv("Username"), os.getenv("Password"))
 class User:
     def __init__(self, name, id):
+        self.last_request = time.time()
         self.name = name
         self.id = id
 class Responder:
-    def __init__(self, projectid, channel, can_respond, can_stream, value):
+    def __init__(self, projectid, channel, can_respond, can_stream, value, user):
+        user.last_request = time.time()
+        self.user = user
         self.projectid = projectid
         self.can_respond = can_respond
         self.can_stream = can_stream
@@ -26,6 +30,7 @@ class Responder:
     def poll(self):
         value = scratch3.get_var(self.projectid, "channel "+str(self.channel))
         if value != self.last_value and value != None:
+            self.user.last_request = time.time()
             self.last_value = value
             binary = coding.decimal_to_binary(int(value))
             if binary[1:3]=="01":
@@ -70,8 +75,6 @@ class Responder:
                     t=time.time()
         self.wrote = True
 class ConnectionEndpoint:
-    def __init__(self):
-        pass
     def receivedMessage(self, message, user, responder):
         global users
         r=random.randrange(1, 2047)
@@ -107,21 +110,19 @@ def thread(n):
                     payload = "true" if binary[23:]=='1' else "false"
                 if payloadformat == "11":
                     payload = coding.convert_to_text(binary[23:])
-            respond = Responder(projectid, n, acceptstaticpayload, acceptstreamingpayload, value)
             if header in users:
                 user = users[header]
             else:
                 user = None
+            respond = Responder(projectid, n, acceptstaticpayload, acceptstreamingpayload, value, user)
             endpoint[reqendpoint].receivedMessage(payload, user, respond)
 
 
-def start_server(endpoints, project_id):
-    global projectid
+def start_server(endpoints):
     global conn
     global endpoint
     endpoints.insert(0, ConnectionEndpoint())
     endpoint = endpoints
-    projectid = project_id
     conn = session.connect_cloud(project_id)
     threads = [threading.Thread(target=thread, args=(i+1,)) for i in range(10)]
     for t in threads: