Universal .on decorator

Author: vshymanskyy

BlynkLib.py

@@ -1,6 +1,6 @@
 # Copyright (c) 2015-2019 Volodymyr Shymanskyy. See the file LICENSE for copying permission.
 
-_VERSION = "0.2.0"
+_VERSION = "0.2.1"
 
 import struct
 import time
@@ -21,7 +21,6 @@ def dummy(*args):
 MSG_PING  = const(6)
 
 MSG_TWEET = const(12)
-MSG_EMAIL = const(13)
 MSG_NOTIFY = const(14)
 MSG_BRIDGE = const(15)
 MSG_HW_SYNC = const(16)
@@ -58,37 +57,27 @@ def __init__(self, auth, heartbeat=10, buffin=1024, log=None):
         self.state = DISCONNECTED
         self.connect()
 
+    # These are mainly for backward-compatibility you can use "blynk.on()" instead
     def ON(blynk, evt):
-        class Decorator:
-            def __init__(self, func):
-                self.func = func
-                blynk.callbacks[evt] = func
-            def __call__(self):
-                return self.func()
-        return Decorator
-
-    # These are mainly for backward-compatibility you can use "blynk.ON()" instead
+        return blynk.on(evt)
     def VIRTUAL_READ(blynk, pin):
-        class Decorator():
-            def __init__(self, func):
-                self.func = func
-                blynk.callbacks["readV"+str(pin)] = func
-            def __call__(self):
-                return self.func()
-        return Decorator
-
+        return blynk.on("readV"+str(pin))
     def VIRTUAL_WRITE(blynk, pin):
-        class Decorator():
+        return blynk.on("V"+str(pin))
+
+    def on(blynk, evt, func=None):
+        if func:
+            blynk.callbacks[evt] = func
+            return
+
+        class Decorator:
             def __init__(self, func):
                 self.func = func
-                blynk.callbacks["V"+str(pin)] = func
+                blynk.callbacks[evt] = func
             def __call__(self):
                 return self.func()
         return Decorator
 
-    def on(self, evt, func):
-        self.callbacks[evt] = func
-
     def emit(self, evt, *a, **kv):
         self.log("Event:", evt, "->", *a)
         if evt in self.callbacks:
@@ -116,8 +105,8 @@ def log_event(self, event, descr=None):
             self._send(MSG_EVENT_LOG, event, descr)
 
     def _send(self, cmd, *args, **kwargs):
-        if "id" in kwargs:
-            id = kwargs.id
+        if 'id' in kwargs:
+            id = kwargs.get('id')
         else:
             id = self.msg_id
             self.msg_id += 1
@@ -146,10 +135,11 @@ def connect(self):
 
     def disconnect(self):
         if self.state == DISCONNECTED: return
+        self.bin = b""
         self.state = DISCONNECTED
         self.emit('disconnected')
 
-    def process(self, data=b''):
+    def process(self, data=None):
         if not (self.state == CONNECTING or self.state == CONNECTED): return
         now = gettime()
         if now - self.lastRecv > self.heartbeat+(self.heartbeat//2):
@@ -164,8 +154,9 @@ def process(self, data=b''):
             self.bin += data
 
         while True:
-            if len(self.bin) < 5: return
-            
+            if len(self.bin) < 5:
+                break
+
             cmd, i, dlen = struct.unpack("!BHH", self.bin[:5])
             if i == 0: return self.disconnect()
 
@@ -191,9 +182,10 @@ def process(self, data=b''):
                 if dlen >= self.buffin:
                     print("Cmd too big: ", dlen)
                     return self.disconnect()
-            
-                if len(self.bin) < 5+dlen: return
-                
+
+                if len(self.bin) < 5+dlen:
+                    break
+
                 data = self.bin[5:5+dlen]
                 self.bin = self.bin[5+dlen:]