modifications for requests library

Author: brentru

adafruit_fona/adafruit_fona.py

@@ -68,9 +68,11 @@
 FONA_HTTP_HEAD = const(0x02)
 
 # TCP/IP
-FONA_TCP_MODE = const(0)
-FONA_UDP_MODE = const(1)
+TCP_MODE = const(0)
+UDP_MODE = const(1)
+
 FONA_MAX_SOCKETS = const(6)
+
 # pylint: enable=bad-whitespace
 
 # pylint: disable=too-many-instance-attributes
@@ -343,6 +345,9 @@ def _set_gprs(self, gprs_on=True):
             if not self._send_check_reply(b"AT+CIICR", reply=REPLY_OK, timeout=10000):
                 return False
 
+            # Query local IP
+            if not self.local_ip:
+                return False
         else:
             # reset PDP state
             if not self._send_check_reply(
@@ -504,18 +509,24 @@ def get_host_by_name(self, hostname):
         """
         self._read_line()
         if self._debug:
-            print("*** get_host_by_name")
+            print("*** get_host_by_name: ", hostname)
         if isinstance(hostname, str):
             hostname = bytes(hostname, "utf-8")
 
-        self._uart.write(b'AT+CDNSGIP="' + hostname + b'"\r\n')
+        self._uart.write(b'AT+CDNSGIP=')
+        self._uart.write(b'"')
+        self._uart.write(hostname)
+        self._uart.write(b'"')
+        self._uart.write(b"\r\n")
 
         if not self._expect_reply(REPLY_OK):
+            print("retin")
             return False
         # eat the blank line
         self._read_line()
         # parse the 3rd line
         self._read_line()
+        print(self._buf)
 
         self._parse_reply(b"+CDNSGIP:", idx=2)
         return self._buf
@@ -609,9 +620,9 @@ def socket_available(self, sock_num):
 
         return self._buf
 
-    def socket_connect(self, sock_num, dest, port, conn_mode=FONA_TCP_MODE):
+    def socket_connect(self, sock_num, dest, port, conn_mode=TCP_MODE):
         """Connects to a destination IP address or hostname.
-        By default, we use conn_mode FONA_TCP_MODE but we may also use FONA_UDP_MODE.
+        By default, we use conn_mode TCP_MODE but we may also use UDP_MODE.
         :param int sock_num: Desired socket number
         :param str dest: Destination dest address.
         :param int port: Destination dest port.
@@ -640,7 +651,7 @@ def socket_connect(self, sock_num, dest, port, conn_mode=FONA_TCP_MODE):
         # Start connection
         self._uart.write(b"AT+CIPSTART=")
         self._uart.write(str(sock_num).encode())
-        if conn_mode == FONA_TCP_MODE:
+        if conn_mode == TCP_MODE:
             if self._debug:
                 print('\t--->AT+CIPSTART="TCP","{}",{}'.format(dest, port))
             self._uart.write(b',"TCP","')

adafruit_fona/adafruit_fona_socket.py

@@ -35,7 +35,6 @@
 
 _the_interface = None  # pylint: disable=invalid-name
 
-
 def set_interface(iface):
     """Helper to set the global internet interface."""
     global _the_interface  # pylint: disable=global-statement, invalid-name
@@ -84,8 +83,7 @@ def gethostbyname(hostname):
     :param str hostname: Desired hostname.
     """
     addr = _the_interface.get_host_by_name(hostname)
-    return addr
-
+    return addr.strip('\"')
 
 # pylint: disable=invalid-name, redefined-builtin
 class socket:
@@ -109,20 +107,24 @@ def __init__(
         SOCKETS.append(self._socknum)
         self.settimeout(self._timeout)
 
+
     @property
     def socknum(self):
         """Returns the socket object's socket number."""
         return self._socknum
 
+
     @property
     def connected(self):
         """Returns whether or not we are connected to the socket."""
         return _the_interface.socket_status(self.socknum)
 
+
     def getpeername(self):
         """Return the remote address to which the socket is connected."""
         return _the_interface.remote_ip(self.socknum)
 
+
     def inet_aton(self, ip_string):
         """Convert an IPv4 address from dotted-quad string format.
         :param str ip_string: IP Address, as a dotted-quad string.
@@ -133,6 +135,7 @@ def inet_aton(self, ip_string):
         self._buffer = bytearray(self._buffer)
         return self._buffer
 
+
     def connect(self, address, conn_mode=None):
         """Connect to a remote socket at address. (The format of address depends
         on the address family — see above.)

examples/fona_simpletest_requests.py

@@ -0,0 +1,78 @@
+import time
+import board
+import busio
+import digitalio
+from adafruit_fona.adafruit_fona import FONA
+import adafruit_fona.adafruit_fona_socket as cellular_socket
+import adafruit_requests as requests
+
+SERVER_ADDRESS = ("wifitest.adafruit.com", 80)
+
+# Get GPRS details and more from a secrets.py file
+try:
+    from secrets import secrets
+except ImportError:
+    print("GPRS secrets are kept in secrets.py, please add them there!")
+    raise
+
+# Create a serial connection for the FONA connection using 4800 baud.
+# These are the defaults you should use for the FONA Shield.
+# For other boards set RX = GPS module TX, and TX = GPS module RX pins.
+uart = busio.UART(board.TX, board.RX, baudrate=4800)
+rst = digitalio.DigitalInOut(board.D4)
+
+# Initialize FONA module (this may take a few seconds)
+fona = FONA(uart, rst, debug=True)
+
+print("Adafruit FONA WebClient Test")
+
+# Enable GPS
+fona.gps = True
+
+# Bring up cellular connection
+fona.configure_gprs((secrets["apn"], secrets["apn_username"], secrets["apn_password"]))
+
+# Bring up GPRS
+fona.gprs = True
+
+
+# Initialize a requests object with a socket and cellular interface
+requests.set_socket(cellular_socket, fona)
+
+TEXT_URL = "http://wifitest.adafruit.com/testwifi/index.html"
+JSON_GET_URL = "http://httpbin.org/get"
+JSON_POST_URL = "http://httpbin.org/post"
+
+
+print("Fetching text from %s" % TEXT_URL)
+response = requests.get(TEXT_URL)
+print("-" * 40)
+
+print("Text Response: ", response.text)
+print("-" * 40)
+response.close()
+
+"""
+print("Connecting to: ", SERVER_ADDRESS[0])
+sock.connect(SERVER_ADDRESS)
+
+print("Connected to:", sock.getpeername())
+
+# Make a HTTP Request
+sock.send(b"GET /testwifi/index.html HTTP/1.1\n")
+sock.send(b"Host: 104.236.193.178")
+sock.send(b"Connection: close\n\n")
+
+bytes_avail = 0
+while not bytes_avail:
+    bytes_avail = sock.available()
+    if bytes_avail > 0:
+        print("bytes_avail: ", bytes_avail)
+        data = sock.recv(bytes_avail)
+        print(data.decode())
+        break
+    time.sleep(0.05)
+
+sock.close()
+print("Socket connected: ", sock.connected)
+"""