Complete Classic telemetry, authenticated player replies and reversible cutover

deploy/classic/relay.py

@@ -14,12 +14,12 @@ CLASSES={1:'Warrior',2:'Paladin',3:'Hunter',4:'Rogue',5:'Priest',7:'Shaman',8:'M
 
 def validate(command):
     if not isinstance(command,dict) or command.get('version')!=1 or command.get('backend')!='cmangos-classic': raise ValueError('Not a typed Classic command')
-    if command.get('kind') not in {'party','leave','recruit','intent','say'}:raise ValueError('Unsupported command kind')
+    if command.get('kind') not in {'party','leave','recruit','intent','say','reply-say','reply-whisper'}:raise ValueError('Unsupported command kind')
     for key in ['guid','accountId','peerGuid','peerAccountId','expiresAt']:
         if type(command.get(key)) is not int or command[key]<0:raise ValueError('Invalid '+key)
     if not command['guid'] or not command['accountId'] or not re.fullmatch('[A-Za-z]{2,12}',command.get('name','')):raise ValueError('Invalid actor identity')
     if command['peerGuid'] and (not command['peerAccountId'] or not re.fullmatch('[A-Za-z]{2,12}',command.get('peerName',''))):raise ValueError('Invalid peer identity')
-    if command['kind'] in {'party','recruit','say'} and not command['peerGuid']:raise ValueError('Peer identity required')
+    if command['kind'] in {'party','recruit','say','reply-say','reply-whisper'} and not command['peerGuid']:raise ValueError('Peer identity required')
     if not isinstance(command.get('argument'),str) or len(command['argument'].encode())>1000:raise ValueError('Invalid argument')
     if command['expiresAt']<time.time() or command['expiresAt']>time.time()+120:raise ValueError('Expired or invalid deadline')
     if command['kind']=='intent' and command['argument'] not in {'quest','explore','rest','trade','socialize'}:raise ValueError('Unsupported intention')
@@ -43,7 +43,7 @@ def main(root,base,env_file):
         req=urllib.request.Request(base.rstrip('/')+path,data=body,headers={'Authorization':'Bearer '+token,'Content-Type':'application/json'})
         with urllib.request.urlopen(req,timeout=10) as response:return response.headers,response.read().decode()
     def complete(id,ok,result):request('/api/bridge/ale/result',{'id':id,'ok':ok,'result':result})
-    last_snapshot=0;last_cleanup=0
+    last_snapshot=0;last_cleanup=0;last_outcomes=0
     while True:
         try:
             now=int(time.time())
@@ -68,6 +68,19 @@ def main(root,base,env_file):
                 if pairs:
                     a,b=pairs[(now//10)%len(pairs)];roster.update(socialA=a['name'],socialB=b['name'],zoneName=a.get('zoneName',''))
                 request('/api/bridge/ale/snapshots',{'payloads':payloads+[roster]});last_snapshot=now
+            for event_id,kind,payload in mysql("SELECT id,kind,HEX(payload) FROM azerothai_events WHERE delivered=0 ORDER BY id LIMIT 30"):
+                data=json.loads(bytes.fromhex(payload));data['nativeEventId']='classic:'+event_id
+                request('/api/bridge/ale/event',{'kind':kind,'payload':data})
+                mysql('UPDATE azerothai_events SET delivered=1 WHERE id='+str(int(event_id)))
+            if now-last_outcomes>=60:
+                rows=mysql("SELECT r.guid,r.name,COALESCE(c.quests,0),COALESCE(c.rewarded,0),COALESCE(c.lootEvents,0),COALESCE(c.lootItems,0),COALESCE(c.lootedCopper,0),COALESCE(c.nativeDeaths,0) FROM azerothai_roster r LEFT JOIN azerothai_counters c ON c.guid=r.guid WHERE r.enabled=1")
+                outcomes=[]
+                for guid,name,quests,rewarded,events,items,copper,deaths in rows:
+                    outcomes.append(dict(guid=int(guid),name=name,quests=int(quests),rewarded=int(rewarded),lootEvents=int(events),lootItems=int(items),lootedCopper=int(copper),nativeDeaths=int(deaths),abandoned=0,partyKills=0))
+                body=json.dumps(dict(at=now,recoveries=[],outcomes=outcomes)).encode()
+                req=urllib.request.Request(base.rstrip('/')+'/api/realm-insights',data=body,headers={'Authorization':'Bearer '+values['AUTONOMY_TOKEN'],'Content-Type':'application/json'})
+                with urllib.request.urlopen(req,timeout=10) as response:response.read()
+                last_outcomes=now
             headers,body=request('/api/bridge/ale/poll')
             id=headers.get('X-AzerothAI-Command')
             if id:
@@ -80,6 +93,7 @@ def main(root,base,env_file):
                 complete(id,status=='completed',bytes.fromhex(result).decode());mysql('UPDATE azerothai_commands SET delivered=1 WHERE id='+quote(id))
             mysql("UPDATE azerothai_commands SET status='failed',result='Expired before native execution' WHERE status='pending' AND expires_at<UNIX_TIMESTAMP()")
             if now-last_cleanup>3600:
+                mysql("DELETE FROM azerothai_events WHERE delivered=1 AND at<UNIX_TIMESTAMP()-604800")
                 mysql("DELETE FROM azerothai_commands WHERE delivered=1 AND created_at<UNIX_TIMESTAMP()-604800");last_cleanup=now
         except Exception as error:
             # Do not print request objects, credentials, or native SQL arguments.