Added app conn/disconn events. Updated tests to support latest pytest-mock version

Author: antohaUa

README.md

@@ -173,6 +173,8 @@ Examples can be found **[here][blynk-py-examples]** Check them all to get famili
 - [09_sync_virtual_pin.py](https://github.com/blynkkk/lib-python/blob/master/examples/09_sync_virtual_pin.py): How to sync virtual pin states and properties
 - [10_rtc_sync.py](https://github.com/blynkkk/lib-python/blob/master/examples/10_rtc_sync.py): How to perform RTC sync with blynk server 
 - [11_ssl_socket.py](https://github.com/blynkkk/lib-python/blob/master/examples/11_ssl_socket.py): SSL server connection. Feature supported only by cPython library. 
+- [12_app_connect_disconnect.py](https://github.com/blynkkk/lib-python/blob/master/examples/12_app_connect_disconnect.py): Managing APP connect/disconnect events with Blynk Cloud. 
+
 
 ##### Raspberry Pi (any):
 Read [Raspberry Pi guide](https://github.com/blynkkk/lib-python/tree/master/examples/raspberry) first.

blynklib.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Anton Morozenko
+# Copyright (c) 2019-2020 Anton Morozenko
 # Copyright (c) 2015-2019 Volodymyr Shymanskyy.
 # See the file LICENSE for copying permission.
 
@@ -348,7 +348,7 @@ def process(self, msg_type, msg_id, msg_len, msg_args):
         elif msg_type == self.MSG_PING:
             self.send(self.response_msg(self.STATUS_OK, msg_id=msg_id))
         elif msg_type in (self.MSG_HW, self.MSG_BRIDGE, self.MSG_INTERNAL):
-            if msg_type == self.MSG_INTERNAL and len(msg_args) >= 2:
+            if msg_type == self.MSG_INTERNAL:
                 self.call_handler("{}{}".format(self._INTERNAL, msg_args[0]), msg_args[1:])
             elif len(msg_args) >= 3 and msg_args[0] == 'vw':
                 self.call_handler("{}{}".format(self._VPIN_WRITE, msg_args[1]), int(msg_args[1]), msg_args[2:])

blynklib_mp.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Anton Morozenko
+# Copyright (c) 2019-2020 Anton Morozenko
 # Copyright (c) 2015-2019 Volodymyr Shymanskyy.
 # See the file LICENSE for copying permission.
 
@@ -337,7 +337,7 @@ def process(self, msg_type, msg_id, msg_len, msg_args):
         elif msg_type == self.MSG_PING:
             self.send(self.response_msg(self.STATUS_OK, msg_id=msg_id))
         elif msg_type in (self.MSG_HW, self.MSG_BRIDGE, self.MSG_INTERNAL):
-            if msg_type == self.MSG_INTERNAL and len(msg_args) >= const(2):
+            if msg_type == self.MSG_INTERNAL:
                 self.call_handler("{}{}".format(self._INTERNAL, msg_args[0]), msg_args[1:])
             elif len(msg_args) >= const(3) and msg_args[0] == 'vw':
                 self.call_handler("{}{}".format(self._VPIN_WRITE, msg_args[1]), int(msg_args[1]), msg_args[2:])

examples/12_app_connect_disconnect.py

@@ -0,0 +1,74 @@
+"""
+[APP CONNECT DISCONNECT EVENTS EXAMPLE] ============================================================
+
+Environment prepare:
+In your Blynk App project:
+  - in Project Settings enable flag "Notify devices when APP connected"
+  - define your auth token for current example and run it
+  - Run the App (green triangle in the upper right corner).
+
+This started program will call handlers and print messages for APP_CONNECT or APP_DISCONNECT events.
+
+Schema:
+====================================================================================================
+          +-----------+                        +--------------+                    +--------------+
+          |           |                        |              |                    |              |
+          | blynk lib |                        | blynk server |                    |  blynk app   |
+          |           |                        |  virtual pin |                    |              |
+          |           |                        |              |                    |              |
+          +-----+-----+                        +------+-------+                    +-------+------+
+                |                                     |    app connected or disconnected   |
+                |                                     |             from server            |
+                                                      |                                    |
+ event handler  |     app connect/disconnect event    +<-----------------------------------+
+(user function) |                                     |                                    |
+     +------------<-----------------------------------+                                    |
+     |          |                                     |                                    |
+     |          |                                     |                                    |
+     +--------->+                                     |                                    |
+                |                                     |                                    |
+                |                                     |                                    |
+                |                                     |                                    |
+                |                                     |                                    |
+                |                                     |                                    |
+                |                                     |                                    |
+                |                                     |                                    |
+                |                                     |                                    |
+                +                                     +                                    +
+====================================================================================================
+Additional blynk info you can find by examining such resources:
+
+    Downloads, docs, tutorials:     https://blynk.io
+    Sketch generator:               http://examples.blynk.cc
+    Blynk community:                http://community.blynk.cc
+    Social networks:                http://www.fb.com/blynkapp
+                                    http://twitter.com/blynk_app
+====================================================================================================
+"""
+
+import blynklib
+
+BLYNK_AUTH = 'YourAuthToken'
+
+# initialize Blynk
+blynk = blynklib.Blynk(BLYNK_AUTH)
+
+APP_CONNECT_PRINT_MSG = '[APP_CONNECT_EVENT]'
+APP_DISCONNECT_PRINT_MSG = '[APP_DISCONNECT_EVENT]'
+
+
+@blynk.handle_event('internal_acon')
+def app_connect_handler(*args):
+    print(APP_CONNECT_PRINT_MSG)
+
+
+@blynk.handle_event('internal_adis')
+def app_disconnect_handler(*args):
+    print(APP_DISCONNECT_PRINT_MSG)
+
+
+###########################################################
+# infinite loop that waits for event
+###########################################################
+while True:
+    blynk.run()

test/test_blynk_connection.py

@@ -14,71 +14,71 @@ def cb(self):
 
     def test_send(self, cb, mocker):
         cb._socket = socket.socket()
-        with mocker.patch('socket.socket.send', return_value=5):
-            result = cb.send('1234')
-            assert result == 5
+        mocker.patch('socket.socket.send', return_value=5)
+        result = cb.send('1234')
+        assert result == 5
 
     def test_send_ioerror(self, cb, mocker):
         cb._socket = socket.socket()
-        with mocker.patch('socket.socket.send', side_effect=IOError('IO')):
-            result = cb.send('1234')
-            assert result is None
+        mocker.patch('socket.socket.send', side_effect=IOError('IO'))
+        result = cb.send('1234')
+        assert result is None
 
     def test_send_oserror(self, cb, mocker):
         cb._socket = socket.socket()
-        with mocker.patch('socket.socket.send', side_effect=OSError('OS')):
-            result = cb.send('1234')
-            assert result is None
+        mocker.patch('socket.socket.send', side_effect=OSError('OS'))
+        result = cb.send('1234')
+        assert result is None
 
     def test_send_socket_timeout(self, cb, mocker):
         cb._socket = socket.socket()
-        with mocker.patch('socket.socket.send', side_effect=socket.timeout()):
-            result = cb.send('1234')
-            assert result is None
+        mocker.patch('socket.socket.send', side_effect=socket.timeout())
+        result = cb.send('1234')
+        assert result is None
 
     def test_send_error_retry_count(self, cb, mocker):
         cb._socket = socket.socket()
-        with mocker.patch('socket.socket.send', side_effect=OSError('OS')):
-            mocker.spy(time, 'sleep')
-            cb.send('1234')
-            assert cb._socket.send.call_count == 3
+        mocker.patch('socket.socket.send', side_effect=OSError('OS'))
+        mocker.spy(time, 'sleep')
+        cb.send('1234')
+        assert cb._socket.send.call_count == 3
 
     def test_receive(self, cb, mocker):
         cb._socket = socket.socket()
-        with mocker.patch('socket.socket.recv', return_value=b'12345'):
-            result = cb.receive(10, 1)
-            assert result == b'12345'
+        mocker.patch('socket.socket.recv', return_value=b'12345')
+        result = cb.receive(10, 1)
+        assert result == b'12345'
 
     def test_receive_timeout(self, cb, mocker):
         cb._socket = socket.socket()
-        with mocker.patch('socket.socket.recv', side_effect=OSError('timed out')):
-            result = cb.receive(10, 1)
-            assert result == b''
+        mocker.patch('socket.socket.recv', side_effect=OSError('timed out'))
+        result = cb.receive(10, 1)
+        assert result == b''
 
     def test_receive_timeout_2(self, cb, mocker):
         cb._socket = socket.socket()
-        with mocker.patch('socket.socket.recv', side_effect=socket.timeout('timed out')):
-            result = cb.receive(10, 1)
-            assert result == b''
+        mocker.patch('socket.socket.recv', side_effect=socket.timeout('timed out'))
+        result = cb.receive(10, 1)
+        assert result == b''
 
     def test_receive_eagain(self, cb, mocker):
         cb._socket = socket.socket()
-        with mocker.patch('socket.socket.recv', side_effect=IOError('[Errno 11]')):
-            result = cb.receive(10, 1)
-            assert result == b''
+        mocker.patch('socket.socket.recv', side_effect=IOError('[Errno 11]'))
+        result = cb.receive(10, 1)
+        assert result == b''
 
     def test_receive_etimeout(self, cb, mocker):
         cb._socket = socket.socket()
-        with mocker.patch('socket.socket.recv', side_effect=OSError('[Errno 60]')):
-            result = cb.receive(10, 1)
-            assert result == b''
+        mocker.patch('socket.socket.recv', side_effect=OSError('[Errno 60]'))
+        result = cb.receive(10, 1)
+        assert result == b''
 
     def test_receive_raise_other_oserror(self, cb, mocker):
         cb._socket = socket.socket()
-        with mocker.patch('socket.socket.recv', side_effect=OSError('[Errno 13]')):
-            with pytest.raises(OSError) as os_err:
-                cb.receive(10, 1)
-            assert '[Errno 13]' in str(os_err.value)
+        mocker.patch('socket.socket.recv', side_effect=OSError('[Errno 13]'))
+        with pytest.raises(OSError) as os_err:
+            cb.receive(10, 1)
+        assert '[Errno 13]' in str(os_err.value)
 
     def test_is_server_alive_negative(self, cb):
         result = cb.is_server_alive()
@@ -103,17 +103,17 @@ def test_is_server_alive_positive_no_ping_2(self, cb):
         assert result is True
 
     def test_get_socket(self, cb, mocker):
-        with mocker.patch('socket.socket'):
-            with mocker.patch('socket.getaddrinfo'):
-                cb._get_socket()
-                assert cb._state == cb.CONNECTING
+        mocker.patch('socket.socket')
+        mocker.patch('socket.getaddrinfo')
+        cb._get_socket()
+        assert cb._state == cb.CONNECTING
 
     def test_get_socket_exception(self, cb, mocker):
-        with mocker.patch('socket.socket'):
-            with mocker.patch('socket.getaddrinfo', side_effect=BlynkError('BE')):
-                with pytest.raises(BlynkError) as b_err:
-                    cb._get_socket()
-                assert 'Connection with the Blynk server failed: BE' in str(b_err.value)
+        mocker.patch('socket.socket')
+        mocker.patch('socket.getaddrinfo', side_effect=BlynkError('BE'))
+        with pytest.raises(BlynkError) as b_err:
+            cb._get_socket()
+        assert 'Connection with the Blynk server failed: BE' in str(b_err.value)
 
     def test_authenticate(self, cb, mocker):
         mocker.patch.object(cb, 'send', return_value=None)