Implemented device invalidation.

src/nightserver.py

@@ -3,9 +3,9 @@ from flask_apscheduler import APScheduler
 from copy import copy
 import uuid
 import time
+from datetime import datetime
 import requests
 
-
 app = Flask(__name__)
 
 # UUID used for internal calls.
@@ -139,7 +139,7 @@ def setFitness():
 
 # Cyberware management
 cyberware = []
-newCyberwareTemplate = { "uuid": None, "name": None, "hotpluggable": False, "lastMalfunction": None, "canSet": None, "battery": None, "messages": None }
+newCyberwareTemplate = { "uuid": None, "name": None, "lastContact": None, "hotpluggable": False, "lastMalfunction": None, "canSet": None, "battery": None, "messages": None }
 newMessageTemplate = { "title": None, "message": None, "progress": None }
 # Messages: { Title, Message, Progress }
 #  Title, Message, and Progress are all technically optional. It's up to the frontend to make heads or tails of what's happening.
@@ -177,6 +177,7 @@ def addCyberware():
 
 		tempNewCyberware['uuid'] = str(uuid.uuid4())
 		tempNewCyberware['name'] = tempName
+		tempNewCyberware['lastContact'] = datetime.now()
 		tempNewCyberware['hotpluggable'] = tempHotpluggable
 		tempNewCyberware['canSet'] = tempCanSet
 
@@ -443,6 +444,7 @@ def authenticate(uuid, endpoint):
 	for c in cyberware: # UUID Match
 		if c['uuid'] == uuid:
 			requestedHardware = c
+			c['lastContact'] = datetime.now() # Update last contact
 			break
 
 	if requestedHardware['canSet'] == None:
@@ -474,7 +476,7 @@ def valueInvalidation():
 	# Search for invalid values
 	invalidated = copy(valuesToValidate)
 	for c in cyberware:
-		for value in valuesToInvalidate:
+		for value in valuesToValidate:
 			if value in c["canSet"]:
 				invalidated.remove(value)
 
@@ -494,8 +496,24 @@ def valueInvalidation():
 	print("Values invalidated: " + invalidStr)
 
 # Device invalidation. A device is deemed invalid after no contact for 15 seconds.
+timeToInvalid = 15.0
+
 def deviceInvalidation():
-	print("Device invalidation not implemented")
+	cyberwareRemoveEndpoint = baseURL + "/api/cyberware/remove"
+
+	print("Start device invalidation")
+	now = datetime.now()
+
+	for c in cyberware:
+		timeSinceContact = (now-c['lastContact']).total_seconds()
+
+		if timeSinceContact > timeToInvalid:
+			# This hardware has not contacted the server in too long, and it is thus deemed invalid.
+			invalidCyberwareName = c['name']
+			invalidCyberwareUUID = c['uuid']
+
+			print("Cyberware is invalid and will be removed: " + invalidCyberwareName)
+			requests.post(cyberwareRemoveEndpoint, json={ 'uuid': invalidCyberwareUUID })
 			
 
 # APScheduler config
@@ -525,4 +543,5 @@ scheduler = APScheduler()
 scheduler.init_app(app)
 scheduler.start()
 
+if __name__ == "__main__":
 	app.run()