Changeset d832164

Timestamp:

2015-06-17T22:46:40Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

b75671d

Parents:

c82a88d

Message:

Restore pings and try to finish login even if WA is rate limiting the sync.

File:

• python/wa.py (modified) (7 diffs)

python/wa.py

@@ -101 +101 @@
                 
                 # We're done once this set is empty.
-                self.todo = set(["contacts", "groups"])
+                self.todo = set(["contacts", "groups", "ping"])
                 
                 # Supposedly WA can also do national-style phone numbers without
@@ -109 +109 @@
                 self.toLower(GetSyncIqProtocolEntity(numbers))
                 self.toLower(ListGroupsIqProtocolEntity())
+                self.b.keepalive()
                 
                 try:
@@ -205 +206 @@
                 elif isinstance(entity, ListGroupsResultIqProtocolEntity):
                         return self.onListGroupsResult(entity)
+                elif "ping" in self.todo: # Pong has no type, sigh.
+                        if "contacts" in self.todo:
+                                # Shitty Whatsapp rejected the sync request, and
+                                # annoying Yowsup doesn't inform on error responses.
+                                # So instead, if we received no response to it but
+                                # did get our ping back, declare failure.
+                                self.onSyncResultFail()
+                        self.check_connected("ping")
         
         def onSyncResult(self, entity):
@@ -219 +228 @@
                                       ", ".join(entity.invalidNumbers))
 
-                # Disabled since yowsup won't give us the result...
-                if entity.inNumbers and False:
-                        self.toLower(GetStatusIqProtocolEntity(entity.inNumbers.values()))
-                        self.todo.add("statuses")
-                        
+                #self.getStatuses(entity.inNumbers.values())
+                self.check_connected("contacts")
+
+        def onSyncResultFail(self):
+                # Whatsapp rate-limits sync stanzas, so in case of failure
+                # just assume all contacts are valid.
+                for jid in self.cb.get_local_contacts():
+                        self.toLower(SubscribePresenceProtocolEntity(jid))
+                        self.cb.add_buddy(jid, "")
+                #self.getStatuses?
                 self.check_connected("contacts")
 
@@ -241 +255 @@
 
                 self.check_connected("groups")
+
+        def getStatuses(self, contacts):
+                return # Disabled since yowsup won't give us the result...
+                self.toLower(GetStatusIqProtocolEntity(contacts))
+                self.todo.add("statuses")
 
         @ProtocolEntityCallback("notification")
@@ -307 +326 @@
         ACCOUNT_FLAGS = 14 # HANDLE_DOMAINS + STATUS_MESSAGE + LOCAL_CONTACTS
         # TODO: HANDLE_DOMAIN in right place (add ... ... nick bug)
+        PING_INTERVAL = 299 # seconds
 
         def login(self, account):
@@ -318 +338 @@
                 self.groups_by_id = {}
 
+                self.next_ping = None
+
         def keepalive(self):
-                # Too noisy while debugging
-                # WTF yowsup is SPAWNING A THREAD just for this. Figure out
-                # how to kill that nonsense.
-                pass
-                #self.yow.Ship(PingIqProtocolEntity(to="s.whatsapp.net"))
+                if self.next_ping and (time.time() < self.next_ping):
+                        return
+                self.yow.Ship(PingIqProtocolEntity(to="s.whatsapp.net"))
+                self.next_ping = time.time() + self.PING_INTERVAL
 
         def logout(self):