Merge pull request #24 from Windham-High-School/main

update from main branch

Author: snorklerjoe

.gitignore

@@ -14,7 +14,6 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 sdist/

code.py

@@ -7,18 +7,15 @@
 connection = Connection()
 print("Connected!")
 
-# Turn off WiFi to save power:
-connection.close_wifi()
+# Sync time:
+connection.sync_time()
 
-# Reconnect WiFi when ready:
-connection.connect_wifi()
+# If none, post Hello World:
+connection.post(Text("Hello World!"))
 
 # Check for code updates from the server:
 connection.code_update()
 
-# If none, post Hello World:
-connection.post(Text("Hello World!"))
-
 # Get status:
 print("Getting status:")
 print(connection.get_status())

cubeserver-api-python.zip

@@ -0,0 +1 @@
+../servercom

lib/servercom

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 ./update_version.sh
-zip -r cubeserver-api-python.zip . -x .gitignore -x ./.git -x package.sh -x update_version.sh -x version.txt 2>&1 > /dev/null
+zip cubeserver-api-python.zip -r lib/ boot.py code.py 2>&1 > /dev/null
 echo cubeserver-api-python.zip

package.sh

@@ -1 +1 @@
-__version__ = "v0.2.0-beta"
+__version__ = "v1.1.0"

servercom/_version.py

@@ -30,11 +30,10 @@ def basic_auth_str(user: str, pwd: str) -> str:
 
 DataClass = enum(
     TEMPERATURE = "temperature",
-    HUMIDITY = "humidity",
     PRESSURE = "pressure",
-    LIGHT_INTENSITY = "light intensity",
     COMMENT = "comment",
-    BATTERY = "remaining battery"
+    BATTERY = "remaining battery",
+    BEACON = "beacon challenge"
 )
 
 class DataPoint():
@@ -69,39 +68,30 @@ class Temperature(DataPoint):
     def __init__(self, value):
         super().__init__(DataClass.TEMPERATURE, value)
 
-class Humidity(DataPoint):
-    """A class for DataPoints that store humidity values"""
-    UNIT = "%"
-    def __init__(self, value):
-        super().__init__(DataClass.HUMIDITY, value)
-
 class Pressure(DataPoint):
     """A class for DataPoints that store barometric pressure values"""
     UNIT="inHg"
     def __init__(self, value):
         super().__init__(DataClass.PRESSURE, value)
 
-class Intensity(DataPoint):
-    """A class for DataPoints that store light intensity values"""
-    UNIT="lux"
-    def __init__(self, value):
-        super().__init__(DataClass.LIGHT_INTENSITY, value)
-
 class Text(DataPoint):
     """A class reserved for DataPoints that are intended as a text comment"""
     UNIT=""  # No unit for regular strings of text
     def __init__(self, value: str):
         super().__init__(DataClass.COMMENT, value)
 
+class BeaconChallenge(DataPoint):
+    """A class reserved for DataPoints that are in response to a message from the beacon"""
+    UNIT=""  # No unit for regular strings of text
+    def __init__(self, value: str):
+        super().__init__(DataClass.BEACON, value)
+
 class BatteryLevel(DataPoint):
     """A class reserved for DataPoints that are intended as an indication of battery level"""
     UNIT="%"  # No unit for regular strings of text
     def __init__(self, value: int):
         super().__init__(DataClass.BATTERY, value)
 
-class ConnectionError(Exception):
-    """Indicates an issue with the server connection"""
-
 class AuthorizationError(ConnectionError):
     """Indicates an issue with the team credentials"""
 
@@ -165,7 +155,7 @@ def __init__(
         self.context.load_verify_locations(cadata=server_cert)
         self.connect_wifi()
 
-    def connect_wifi(self, attempts=10) -> None:
+    def connect_wifi(self, attempts=50) -> None:
         """Creates the wifi connection to the access point"""
         wifi.radio.enabled = True
         if self.v:
@@ -179,7 +169,7 @@ def connect_wifi(self, attempts=10) -> None:
                 if self.v:
                     print(e.with_traceback)
             attempts -= 1
-            time.sleep(1)
+            time.sleep(.1)
         if self.v:
             print("Initializing socket pool...")
         self.pool = socketpool.SocketPool(wifi.radio)    
@@ -218,6 +208,7 @@ def radio(self):
         return wifi.radio
 
     def rx_bytes(self) -> bytes:
+        total_length: int = None
         response = b""
         while True:
             buf = bytearray(256)
@@ -228,12 +219,21 @@ def rx_bytes(self) -> bytes:
                     recvd = 0
                 else:
                     raise
-            response += buf
+            response += bytes(buf).replace(b'\x00', b'')
             del buf
             collect()
             if self.v:
                 print(f"Received {recvd} bytes")
-            if recvd == 0:
+            if response.endswith(b'\r\n\r\n'):
+                header_chunks = response.split(b'\r\n')
+                for header in header_chunks:
+                    if header.startswith(b'Content-Length: '):
+                        total_length = len(response) + int(header.split(b' ')[1])
+                        break
+            if recvd == 0 or (
+                total_length is not None and \
+                    len(response) >= total_length
+            ):
                 del recvd
                 collect()
                 break
@@ -267,8 +267,8 @@ def _do_request(
                 f"{method} {path} HTTP/1.1\r\n" +
                 "Host: api.local\r\n" +
                 "Connection: close\r\n" +
-                f"Authorization: Basic {auth_str}" +
-                '\r\n'.join(headers) + "\r\n"
+                f"Authorization: Basic {auth_str}\r\n" +
+                '\r\n'.join(headers)
             )
             del auth_str
             collect()
@@ -283,7 +283,8 @@ def _do_request(
                     f"Content-Length: {len(body)}\r\n" +
                     f"\r\n{body}\r\n"
                 )
-            req_text += '\r\n'
+            else:
+                req_text += '\r\n\r\n'
 
             if self.v:
                 print("Sending request...")
@@ -302,7 +303,7 @@ def _do_request(
             collect()
             if self.v:
                 print("Receiving response...")
-            self.wrapped_socket.setblocking(False)
+            self.wrapped_socket.settimeout(self.conf.TIMEOUT)
             response = self.rx_bytes()
         except Exception as e:
             if self.v:
@@ -388,7 +389,7 @@ def get_status(self) -> GameStatus:
         resp_json = loads(resp[1])
         if self.v:
             print(f"It is {resp_json['unix_time']} seconds since the epoch.")
-        return GameStatus(Time(resp_json['unix_time']), resp_json['status']['score'])
+        return GameStatus(Time(resp_json['unix_time']), resp_json['status']['score'], resp_json['CubeServer_version'])
 
     def sync_time(self) -> bool:
         """Syncs the current clock against the server"""

servercom/implementations/circuitpy.py

@@ -15,7 +15,8 @@
 
 GameStatus = namedtuple("GameStatus",
     ['time',
-    'score']
+    'score',
+    'CubeServer_version']
 )
 
 HTTPResponse = namedtuple("HTTPResponse",

servercom/implementations/common.py

@@ -18,11 +18,10 @@
 # Helpers:
 class DataClass(str, Enum):
     TEMPERATURE = "temperature"
-    HUMIDITY = "humidity"
     PRESSURE = "pressure"
-    LIGHT_INTENSITY = "light intensity"
     COMMENT = "comment"
     BATTERY = "remaining battery"
+    BEACON = "beacon challenge"
 
 class DataPoint():
     """A class for storing and handling datapoints"""
@@ -56,30 +55,24 @@ class Temperature(DataPoint):
     def __init__(self, value):
         super().__init__(DataClass.TEMPERATURE, value)
 
-class Humidity(DataPoint):
-    """A class for DataPoints that store humidity values"""
-    UNIT = "%"
-    def __init__(self, value):
-        super().__init__(DataClass.HUMIDITY, value)
-
 class Pressure(DataPoint):
     """A class for DataPoints that store barometric pressure values"""
     UNIT="inHg"
     def __init__(self, value):
         super().__init__(DataClass.PRESSURE, value)
 
-class Intensity(DataPoint):
-    """A class for DataPoints that store light intensity values"""
-    UNIT="lux"
-    def __init__(self, value):
-        super().__init__(DataClass.LIGHT_INTENSITY, value)
-
 class Text(DataPoint):
     """A class reserved for DataPoints that are intended as a text comment"""
     UNIT=""  # No unit for regular strings of text
     def __init__(self, value: str):
         super().__init__(DataClass.COMMENT, value)
 
+class BeaconChallenge(DataPoint):
+    """A class reserved for DataPoints that are in response to a message from the beacon"""
+    UNIT=""  # No unit for regular strings of text
+    def __init__(self, value: str):
+        super().__init__(DataClass.BEACON, value)
+
 class BatteryLevel(DataPoint):
     """A class reserved for DataPoints that are intended as an indication of battery level"""
     UNIT="%"  # No unit for regular strings of text
@@ -344,7 +337,7 @@ def get_status(self) -> GameStatus:
         """
         resp = self.request('GET', '/status')
         resp_json = loads(resp[1])
-        return GameStatus(Time(resp_json['unix_time']), resp_json['status']['score'])
+        return GameStatus(Time(resp_json['unix_time']), resp_json['status']['score'], resp_json['CubeServer_version'])
 
     def sync_time(self) -> bool:
         """Syncs the current clock against the server"""

servercom/implementations/cpy.py

@@ -0,0 +1,90 @@
+from sys import implementation as _implementation
+if _implementation.name != 'circuitpython':
+    raise NotImplementedError("Woah there, Bud! You can only do IR stuff from CircuitPython!")
+
+import pulseio
+import board
+import digitalio
+import adafruit_irremote
+#irPin = digitalio.DigitalInOut(board.A0)
+#irPin.direction = digitalio.Direction.INPUT
+DEFAULT_PULSEIN = pulseio.PulseIn(board.A0, maxlen=30000, idle_state=True)
+DEFAULT_DECODER = adafruit_irremote.GenericDecode()
+
+def decode_chunk(decoder, pulsein) -> bytes:
+    pulses = decoder.read_pulses(pulsein)
+    try:
+        buf = bytes(decoder.decode_bits(pulses))
+        print(".", end="")
+        return buf
+    except adafruit_irremote.IRNECRepeatException:
+        return b''
+    except adafruit_irremote.IRDecodeException:
+        return b''
+    except adafruit_irremote.FailedToDecode:
+        return b''
+
+def decode_line(decoder, pulsein) -> bytes:
+    buf = b''
+    for i in range(10):
+        buf += decode_chunk(decoder, pulsein)
+        if buf.endswith(b'\r\n'):
+            break
+    return buf
+
+class IRMsg:
+    def __init__(self, headers, body):
+        self.headers = headers
+        self.body = body
+    
+    @property
+    def division(self):
+        return self.headers[b'Division'].decode()
+
+    @property
+    def text(self):
+        return self.body.decode()
+
+def receive(decoder = DEFAULT_DECODER, pulsein = DEFAULT_PULSEIN):
+    # Read until BELL
+    print("*", end="")
+    while decode_chunk(decoder, pulsein) != b'\x07':
+        pass
+    buf = b'\x07'
+    # Read until no BELL
+    print("*", end="")
+    while buf == b'\x07':
+        buf = decode_chunk(decoder, pulsein)
+    # Figure out datagram length
+    print("*", end="")
+    total_length = int.from_bytes(buf, 'big')
+    read_length = 0
+    if total_length < 8:
+        return b'', b'', b''
+    # Start receiving the datagram
+    print("*", end="")
+    protocol = decode_line(decoder, pulsein)
+    read_length += len(protocol)
+    if protocol != b"CSMSG/1.0\r\n":
+        print("Potentially unsupported protocol version. Try getting the latest servercom library?")
+    headers = {}
+    buf = b': '
+    while buf.find(b': ') >= 0 or buf == b'\r\n':
+        print("*", end="")
+        buf = decode_line(decoder, pulsein)
+        read_length += len(buf)
+        if buf == b'\r\n':
+            break
+        split_buf = buf.strip(b'\r\n').split(b': ')
+        headers.update({split_buf[0]: split_buf[1]})
+    body = b''
+    content_length = int(headers[b'Content-Length'])
+    while len(body) < content_length:
+        print("*", end="")
+        body += decode_chunk(decoder, pulsein)
+    return IRMsg(headers, body)
+
+#dude = receive()
+#print()
+#print(dude.division)
+#print(dude.text)