v0.8.7

ignore python3.7 pipenv check warning
version 0.8.6
2026-08-24 19:54:11 -05:00 · 2022-12-02 20:48:51 -05:00 · 2022-12-02 20:48:12 -05:00 · 2022-12-02 20:42:35 -05:00 · 2022-12-02 20:42:35 -05:00 · 2022-10-02 00:18:11 -04:00
56 changed files with 5062 additions and 429 deletions
@@ -0,0 +1,53 @@
+---
+name: 'Setup help: tconnectsync-heroku'
+about: When experiencing an issue setting up tconnectsync-heroku
+title: ''
+labels: heroku, setup help
+assignees: ''
+
+---
+
+**Describe the problem**
+A clear and concise description of the issue you're experiencing.
+
+
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. ...
+2. ...
+
+
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+
+
+**Have you followed the [Troubleshooting steps in the README?](https://github.com/jwoglom/tconnectsync-heroku#troubleshooting)** (Yes or No)
+
+
+
+**Setup details**
+
+* **On what platform are you using the t:connect mobile app?** (Android or iOS)
+* **What version are you using of the t:connect mobile app?**
+
+
+
+**Heroku log output**
+If applicable, add the full output from the heroku logs in More > View Logs. ([See the instructions in the README.](https://github.com/jwoglom/tconnectsync-heroku#testing))
+
+
+
+**Check Login output**
+If applicable, [please follow the instructions to visit the `check_login` page](https://github.com/jwoglom/tconnectsync-heroku#testing), and copy and paste the output here.
+
+This file may contain sensitive details like your Nightscout URL and pump serial number. Copy the output into a text editor like Textedit or Notepad first and find-and-replace sensitive strings, like your Nightscout URL and pump serial number, if they appear.
+
+The output will also contain pump and CGM related information such as delivery events and blood sugars. If you would prefer to keep the contents private, send an email to tconnectsync<at>wogloms.net with the log output so @jwoglom can investigate.
+
+
+
+**Additional context**
+Add any other context about the problem here.
@@ -0,0 +1,49 @@
+---
+name: 'Setup help: tconnectsync'
+about: When experiencing an issue setting up tconnectsync on Windows, Linux, or MacOS.
+title: ''
+labels: setup help
+assignees: ''
+
+---
+
+**Describe the problem**
+A clear and concise description of the issue you're experiencing.
+
+
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. ...
+2. ...
+
+
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+
+
+**Setup details**
+
+* **Operating system:** 
+* **tconnectsync version** (from `--version`): 
+* **On what platform are you using the t:connect mobile app?** (Android or iOS)
+* **What version are you using of the t:connect mobile app?**
+
+
+
+**Terminal output**
+If applicable, add the full output from your terminal from running tconnectsync. Copy the output into a text editor like Textedit or Notepad first and find-and-replace sensitive strings, like your Nightscout URL and pump serial number, if they appear.
+
+
+
+**Check Login output**
+If applicable, please run `--check-login` and upload the tconnectsync-check-output.log file as an attachment on the issue. This file should have sensitive details like your Nightscout URL and pump serial number automatically removed, but double-check before uploading.
+
+This log will contain pump and CGM related information such as delivery events and blood sugars. If you would prefer to keep the contents private, send an email to tconnectsync<at>wogloms.net with the log output so @jwoglom can investigate.
+
+
+
+**Additional context**
+Add any other context about the problem here.
@@ -1,9 +1,9 @@
 name: Publish Docker image
 on:
  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+    tags:
+      - 'v*'
+  workflow_dispatch:

 jobs:
  push_to_registry:
@@ -21,3 +21,35 @@ jobs:
          registry: docker.pkg.github.com
          repository: jwoglom/tconnectsync/tconnectsync
          tag_with_ref: true
+
+  push_to_dockerhub:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: jwoglom/tconnectsync
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
@@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ['3.7', '3.8', '3.9', '3.10']

    steps:
    - uses: actions/checkout@v2
@@ -30,7 +30,8 @@ jobs:
        pipenv install --system
    - name: Run pipenv check
      run: |
-        pipenv check
+        pipenv check \
+          --ignore 51499 # DDoS attack in wheel package, which is unsupported in python 3.7
    - name: Lint with flake8
      run: |
        # stop the build if there are Python syntax errors or undefined names
@@ -7,3 +7,5 @@ build
 *.swa
 *.egg-info
 .env
+tconnectsync-check-output.log
+ignore_*
@@ -7,13 +7,14 @@ verify_ssl = true
 ptpython = "*"

 [packages]
-tconnectsync = {editable = true, path = "."}
+tconnectsync = {path = "."}
 requests = "*"
 bs4 = "*"
 arrow = "*"
 lxml = "*"
 python-dotenv = "*"
 requests-mock = "*"
+pysocks = "*"

 [scripts]
 tconnectsync = "python3 main.py"
@@ -1,7 +1,7 @@
 {
    "_meta": {
        "hash": {
-            "sha256": "413f8bbd66e702656262deda1b6586d42b5a2e9fa52f6d23416b1ea1efbc2591"
+            "sha256": "b5eacb40f06a4e1d7e3951b84c11699899f1f264f028d43281bdf217f6737956"
        },
        "pipfile-spec": 6,
        "requires": {},
@@ -16,19 +16,19 @@
    "default": {
        "arrow": {
            "hashes": [
-                "sha256:16fc29bbd9e425e3eb0fef3018297910a0f4568f21116fc31771e2760a50e074",
-                "sha256:8fb7d9d3d4bf90e49e734c22fa077bdd0964135c4b8120de2510575a8d1f620c"
+                "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1",
+                "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"
            ],
            "index": "pypi",
-            "version": "==1.2.0"
+            "version": "==1.2.3"
        },
        "beautifulsoup4": {
            "hashes": [
-                "sha256:9a315ce70049920ea4572a4055bc4bd700c940521d36fc858205ad4fcde149bf",
-                "sha256:c23ad23c521d818955a4151a67d81580319d4bf548d3d49f4223ae041ff98891"
+                "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30",
+                "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"
            ],
-            "markers": "python_version >= '3.1'",
-            "version": "==4.10.0"
+            "markers": "python_version >= '3.6'",
+            "version": "==4.11.1"
        },
        "bs4": {
            "hashes": [
@@ -39,80 +39,112 @@
        },
        "certifi": {
            "hashes": [
-                "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872",
-                "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"
+                "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14",
+                "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"
            ],
-            "version": "==2021.10.8"
+            "markers": "python_version >= '3.6'",
+            "version": "==2022.9.24"
        },
        "charset-normalizer": {
            "hashes": [
-                "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0",
-                "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"
+                "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845",
+                "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"
            ],
-            "markers": "python_version >= '3'",
-            "version": "==2.0.7"
+            "markers": "python_version >= '3.6'",
+            "version": "==2.1.1"
        },
        "idna": {
            "hashes": [
-                "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff",
-                "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"
+                "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4",
+                "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"
            ],
-            "markers": "python_version >= '3'",
-            "version": "==3.3"
+            "markers": "python_version >= '3.5'",
+            "version": "==3.4"
        },
        "lxml": {
            "hashes": [
-                "sha256:079f3ae844f38982d156efce585bc540c16a926d4436712cf4baee0cce487a3d",
-                "sha256:0fbcf5565ac01dff87cbfc0ff323515c823081c5777a9fc7703ff58388c258c3",
-                "sha256:122fba10466c7bd4178b07dba427aa516286b846b2cbd6f6169141917283aae2",
-                "sha256:1b38116b6e628118dea5b2186ee6820ab138dbb1e24a13e478490c7db2f326ae",
-                "sha256:1b7584d421d254ab86d4f0b13ec662a9014397678a7c4265a02a6d7c2b18a75f",
-                "sha256:26e761ab5b07adf5f555ee82fb4bfc35bf93750499c6c7614bd64d12aaa67927",
-                "sha256:289e9ca1a9287f08daaf796d96e06cb2bc2958891d7911ac7cae1c5f9e1e0ee3",
-                "sha256:2a9d50e69aac3ebee695424f7dbd7b8c6d6eb7de2a2eb6b0f6c7db6aa41e02b7",
-                "sha256:3082c518be8e97324390614dacd041bb1358c882d77108ca1957ba47738d9d59",
-                "sha256:33bb934a044cf32157c12bfcfbb6649807da20aa92c062ef51903415c704704f",
-                "sha256:3439c71103ef0e904ea0a1901611863e51f50b5cd5e8654a151740fde5e1cade",
-                "sha256:36108c73739985979bf302006527cf8a20515ce444ba916281d1c43938b8bb96",
-                "sha256:39b78571b3b30645ac77b95f7c69d1bffc4cf8c3b157c435a34da72e78c82468",
-                "sha256:4289728b5e2000a4ad4ab8da6e1db2e093c63c08bdc0414799ee776a3f78da4b",
-                "sha256:4bff24dfeea62f2e56f5bab929b4428ae6caba2d1eea0c2d6eb618e30a71e6d4",
-                "sha256:4c61b3a0db43a1607d6264166b230438f85bfed02e8cff20c22e564d0faff354",
-                "sha256:542d454665a3e277f76954418124d67516c5f88e51a900365ed54a9806122b83",
-                "sha256:5a0a14e264069c03e46f926be0d8919f4105c1623d620e7ec0e612a2e9bf1c04",
-                "sha256:5c8c163396cc0df3fd151b927e74f6e4acd67160d6c33304e805b84293351d16",
-                "sha256:64812391546a18896adaa86c77c59a4998f33c24788cadc35789e55b727a37f4",
-                "sha256:66e575c62792c3f9ca47cb8b6fab9e35bab91360c783d1606f758761810c9791",
-                "sha256:6f12e1427285008fd32a6025e38e977d44d6382cf28e7201ed10d6c1698d2a9a",
-                "sha256:74f7d8d439b18fa4c385f3f5dfd11144bb87c1da034a466c5b5577d23a1d9b51",
-                "sha256:7610b8c31688f0b1be0ef882889817939490a36d0ee880ea562a4e1399c447a1",
-                "sha256:76fa7b1362d19f8fbd3e75fe2fb7c79359b0af8747e6f7141c338f0bee2f871a",
-                "sha256:7728e05c35412ba36d3e9795ae8995e3c86958179c9770e65558ec3fdfd3724f",
-                "sha256:8157dadbb09a34a6bd95a50690595e1fa0af1a99445e2744110e3dca7831c4ee",
-                "sha256:820628b7b3135403540202e60551e741f9b6d3304371712521be939470b454ec",
-                "sha256:884ab9b29feaca361f7f88d811b1eea9bfca36cf3da27768d28ad45c3ee6f969",
-                "sha256:89b8b22a5ff72d89d48d0e62abb14340d9e99fd637d046c27b8b257a01ffbe28",
-                "sha256:92e821e43ad382332eade6812e298dc9701c75fe289f2a2d39c7960b43d1e92a",
-                "sha256:b007cbb845b28db4fb8b6a5cdcbf65bacb16a8bd328b53cbc0698688a68e1caa",
-                "sha256:bc4313cbeb0e7a416a488d72f9680fffffc645f8a838bd2193809881c67dd106",
-                "sha256:bccbfc27563652de7dc9bdc595cb25e90b59c5f8e23e806ed0fd623755b6565d",
-                "sha256:c1a40c06fd5ba37ad39caa0b3144eb3772e813b5fb5b084198a985431c2f1e8d",
-                "sha256:c47ff7e0a36d4efac9fd692cfa33fbd0636674c102e9e8d9b26e1b93a94e7617",
-                "sha256:c4f05c5a7c49d2fb70223d0d5bcfbe474cf928310ac9fa6a7c6dddc831d0b1d4",
-                "sha256:cdaf11d2bd275bf391b5308f86731e5194a21af45fbaaaf1d9e8147b9160ea92",
-                "sha256:ce256aaa50f6cc9a649c51be3cd4ff142d67295bfc4f490c9134d0f9f6d58ef0",
-                "sha256:d2e35d7bf1c1ac8c538f88d26b396e73dd81440d59c1ef8522e1ea77b345ede4",
-                "sha256:d916d31fd85b2f78c76400d625076d9124de3e4bda8b016d25a050cc7d603f24",
-                "sha256:df7c53783a46febb0e70f6b05df2ba104610f2fb0d27023409734a3ecbb78fb2",
-                "sha256:e1cbd3f19a61e27e011e02f9600837b921ac661f0c40560eefb366e4e4fb275e",
-                "sha256:efac139c3f0bf4f0939f9375af4b02c5ad83a622de52d6dfa8e438e8e01d0eb0",
-                "sha256:efd7a09678fd8b53117f6bae4fa3825e0a22b03ef0a932e070c0bdbb3a35e654",
-                "sha256:f2380a6376dfa090227b663f9678150ef27543483055cc327555fb592c5967e2",
-                "sha256:f8380c03e45cf09f8557bdaa41e1fa7c81f3ae22828e1db470ab2a6c96d8bc23",
-                "sha256:f90ba11136bfdd25cae3951af8da2e95121c9b9b93727b1b896e3fa105b2f586"
+                "sha256:04da965dfebb5dac2619cb90fcf93efdb35b3c6994fea58a157a834f2f94b318",
+                "sha256:0538747a9d7827ce3e16a8fdd201a99e661c7dee3c96c885d8ecba3c35d1032c",
+                "sha256:0645e934e940107e2fdbe7c5b6fb8ec6232444260752598bc4d09511bd056c0b",
+                "sha256:079b68f197c796e42aa80b1f739f058dcee796dc725cc9a1be0cdb08fc45b000",
+                "sha256:0f3f0059891d3254c7b5fb935330d6db38d6519ecd238ca4fce93c234b4a0f73",
+                "sha256:10d2017f9150248563bb579cd0d07c61c58da85c922b780060dcc9a3aa9f432d",
+                "sha256:1355755b62c28950f9ce123c7a41460ed9743c699905cbe664a5bcc5c9c7c7fb",
+                "sha256:13c90064b224e10c14dcdf8086688d3f0e612db53766e7478d7754703295c7c8",
+                "sha256:1423631e3d51008871299525b541413c9b6c6423593e89f9c4cfbe8460afc0a2",
+                "sha256:1436cf0063bba7888e43f1ba8d58824f085410ea2025befe81150aceb123e345",
+                "sha256:1a7c59c6ffd6ef5db362b798f350e24ab2cfa5700d53ac6681918f314a4d3b94",
+                "sha256:1e1cf47774373777936c5aabad489fef7b1c087dcd1f426b621fda9dcc12994e",
+                "sha256:206a51077773c6c5d2ce1991327cda719063a47adc02bd703c56a662cdb6c58b",
+                "sha256:21fb3d24ab430fc538a96e9fbb9b150029914805d551deeac7d7822f64631dfc",
+                "sha256:27e590352c76156f50f538dbcebd1925317a0f70540f7dc8c97d2931c595783a",
+                "sha256:287605bede6bd36e930577c5925fcea17cb30453d96a7b4c63c14a257118dbb9",
+                "sha256:2aaf6a0a6465d39b5ca69688fce82d20088c1838534982996ec46633dc7ad6cc",
+                "sha256:32a73c53783becdb7eaf75a2a1525ea8e49379fb7248c3eeefb9412123536387",
+                "sha256:41fb58868b816c202e8881fd0f179a4644ce6e7cbbb248ef0283a34b73ec73bb",
+                "sha256:4780677767dd52b99f0af1f123bc2c22873d30b474aa0e2fc3fe5e02217687c7",
+                "sha256:4878e667ebabe9b65e785ac8da4d48886fe81193a84bbe49f12acff8f7a383a4",
+                "sha256:487c8e61d7acc50b8be82bda8c8d21d20e133c3cbf41bd8ad7eb1aaeb3f07c97",
+                "sha256:4beea0f31491bc086991b97517b9683e5cfb369205dac0148ef685ac12a20a67",
+                "sha256:4cfbe42c686f33944e12f45a27d25a492cc0e43e1dc1da5d6a87cbcaf2e95627",
+                "sha256:4d5bae0a37af799207140652a700f21a85946f107a199bcb06720b13a4f1f0b7",
+                "sha256:4e285b5f2bf321fc0857b491b5028c5f276ec0c873b985d58d7748ece1d770dd",
+                "sha256:57e4d637258703d14171b54203fd6822fda218c6c2658a7d30816b10995f29f3",
+                "sha256:5974895115737a74a00b321e339b9c3f45c20275d226398ae79ac008d908bff7",
+                "sha256:5ef87fca280fb15342726bd5f980f6faf8b84a5287fcc2d4962ea8af88b35130",
+                "sha256:603a464c2e67d8a546ddaa206d98e3246e5db05594b97db844c2f0a1af37cf5b",
+                "sha256:6653071f4f9bac46fbc30f3c7838b0e9063ee335908c5d61fb7a4a86c8fd2036",
+                "sha256:6ca2264f341dd81e41f3fffecec6e446aa2121e0b8d026fb5130e02de1402785",
+                "sha256:6d279033bf614953c3fc4a0aa9ac33a21e8044ca72d4fa8b9273fe75359d5cca",
+                "sha256:6d949f53ad4fc7cf02c44d6678e7ff05ec5f5552b235b9e136bd52e9bf730b91",
+                "sha256:6daa662aba22ef3258934105be2dd9afa5bb45748f4f702a3b39a5bf53a1f4dc",
+                "sha256:6eafc048ea3f1b3c136c71a86db393be36b5b3d9c87b1c25204e7d397cee9536",
+                "sha256:830c88747dce8a3e7525defa68afd742b4580df6aa2fdd6f0855481e3994d391",
+                "sha256:86e92728ef3fc842c50a5cb1d5ba2bc66db7da08a7af53fb3da79e202d1b2cd3",
+                "sha256:8caf4d16b31961e964c62194ea3e26a0e9561cdf72eecb1781458b67ec83423d",
+                "sha256:8d1a92d8e90b286d491e5626af53afef2ba04da33e82e30744795c71880eaa21",
+                "sha256:8f0a4d179c9a941eb80c3a63cdb495e539e064f8054230844dcf2fcb812b71d3",
+                "sha256:9232b09f5efee6a495a99ae6824881940d6447debe272ea400c02e3b68aad85d",
+                "sha256:927a9dd016d6033bc12e0bf5dee1dde140235fc8d0d51099353c76081c03dc29",
+                "sha256:93e414e3206779ef41e5ff2448067213febf260ba747fc65389a3ddaa3fb8715",
+                "sha256:98cafc618614d72b02185ac583c6f7796202062c41d2eeecdf07820bad3295ed",
+                "sha256:9c3a88d20e4fe4a2a4a84bf439a5ac9c9aba400b85244c63a1ab7088f85d9d25",
+                "sha256:9f36de4cd0c262dd9927886cc2305aa3f2210db437aa4fed3fb4940b8bf4592c",
+                "sha256:a60f90bba4c37962cbf210f0188ecca87daafdf60271f4c6948606e4dabf8785",
+                "sha256:a614e4afed58c14254e67862456d212c4dcceebab2eaa44d627c2ca04bf86837",
+                "sha256:ae06c1e4bc60ee076292e582a7512f304abdf6c70db59b56745cca1684f875a4",
+                "sha256:b122a188cd292c4d2fcd78d04f863b789ef43aa129b233d7c9004de08693728b",
+                "sha256:b570da8cd0012f4af9fa76a5635cd31f707473e65a5a335b186069d5c7121ff2",
+                "sha256:bcaa1c495ce623966d9fc8a187da80082334236a2a1c7e141763ffaf7a405067",
+                "sha256:bd34f6d1810d9354dc7e35158aa6cc33456be7706df4420819af6ed966e85448",
+                "sha256:be9eb06489bc975c38706902cbc6888f39e946b81383abc2838d186f0e8b6a9d",
+                "sha256:c4b2e0559b68455c085fb0f6178e9752c4be3bba104d6e881eb5573b399d1eb2",
+                "sha256:c62e8dd9754b7debda0c5ba59d34509c4688f853588d75b53c3791983faa96fc",
+                "sha256:c852b1530083a620cb0de5f3cd6826f19862bafeaf77586f1aef326e49d95f0c",
+                "sha256:d9fc0bf3ff86c17348dfc5d322f627d78273eba545db865c3cd14b3f19e57fa5",
+                "sha256:dad7b164905d3e534883281c050180afcf1e230c3d4a54e8038aa5cfcf312b84",
+                "sha256:e5f66bdf0976ec667fc4594d2812a00b07ed14d1b44259d19a41ae3fff99f2b8",
+                "sha256:e8f0c9d65da595cfe91713bc1222af9ecabd37971762cb830dea2fc3b3bb2acf",
+                "sha256:edffbe3c510d8f4bf8640e02ca019e48a9b72357318383ca60e3330c23aaffc7",
+                "sha256:eea5d6443b093e1545ad0210e6cf27f920482bfcf5c77cdc8596aec73523bb7e",
+                "sha256:ef72013e20dd5ba86a8ae1aed7f56f31d3374189aa8b433e7b12ad182c0d2dfb",
+                "sha256:f05251bbc2145349b8d0b77c0d4e5f3b228418807b1ee27cefb11f69ed3d233b",
+                "sha256:f1be258c4d3dc609e654a1dc59d37b17d7fef05df912c01fc2e15eb43a9735f3",
+                "sha256:f9ced82717c7ec65a67667bb05865ffe38af0e835cdd78728f1209c8fffe0cad",
+                "sha256:fe17d10b97fdf58155f858606bddb4e037b805a60ae023c009f760d8361a4eb8",
+                "sha256:fe749b052bb7233fe5d072fcb549221a8cb1a16725c47c37e42b0b9cb3ff2c3f"
            ],
            "index": "pypi",
-            "version": "==4.6.3"
+            "version": "==4.9.1"
+        },
+        "pysocks": {
+            "hashes": [
+                "sha256:08e69f092cc6dbe92a0fdd16eeb9b9ffbc13cadfe5ca4c7bd92ffb078b293299",
+                "sha256:2725bd0a9925919b9b51739eea5f9e2bae91e83288108a9ad338b2e3a4435ee5",
+                "sha256:3f8804571ebe159c380ac6de37643bb4685970655d3bba243530d6558b799aa0"
+            ],
+            "index": "pypi",
+            "version": "==1.7.1"
        },
        "python-dateutil": {
            "hashes": [
@@ -124,27 +156,27 @@
        },
        "python-dotenv": {
            "hashes": [
-                "sha256:14f8185cc8d494662683e6914addcb7e95374771e707601dfc70166946b4c4b8",
-                "sha256:bbd3da593fc49c249397cbfbcc449cf36cb02e75afc8157fcc6a81df6fb7750a"
+                "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5",
+                "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"
            ],
            "index": "pypi",
-            "version": "==0.19.1"
+            "version": "==0.21.0"
        },
        "requests": {
            "hashes": [
-                "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24",
-                "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"
+                "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983",
+                "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"
            ],
            "index": "pypi",
-            "version": "==2.26.0"
+            "version": "==2.28.1"
        },
        "requests-mock": {
            "hashes": [
-                "sha256:0a2d38a117c08bb78939ec163522976ad59a6b7fdd82b709e23bb98004a44970",
-                "sha256:8d72abe54546c1fc9696fa1516672f1031d72a55a1d66c85184f972a24ba0eba"
+                "sha256:2fdbb637ad17ee15c06f33d31169e71bf9fe2bdb7bc9da26185be0dd8d842699",
+                "sha256:59c9c32419a9fb1ae83ec242d98e889c45bd7d7a65d48375cc243ec08441658b"
            ],
            "index": "pypi",
-            "version": "==1.9.3"
+            "version": "==1.10.0"
        },
        "six": {
            "hashes": [
@@ -156,23 +188,23 @@
        },
        "soupsieve": {
            "hashes": [
-                "sha256:052774848f448cf19c7e959adf5566904d525f33a3f8b6ba6f6f8f26ec7de0cc",
-                "sha256:c2c1c2d44f158cdbddab7824a9af8c4f83c76b1e23e049479aa432feb6c4c23b"
+                "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759",
+                "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"
            ],
            "markers": "python_version >= '3.6'",
-            "version": "==2.2.1"
+            "version": "==2.3.2.post1"
        },
        "tconnectsync": {
-            "editable": true,
-            "path": "."
+            "path": ".",
+            "version": "==0.8.6"
        },
        "urllib3": {
            "hashes": [
-                "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece",
-                "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"
+                "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc",
+                "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"
            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
-            "version": "==1.26.7"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
+            "version": "==1.26.13"
        }
    },
    "develop": {
@@ -185,43 +217,43 @@
        },
        "jedi": {
            "hashes": [
-                "sha256:18456d83f65f400ab0c2d3319e48520420ef43b23a086fdc05dff34132f0fb93",
-                "sha256:92550a404bad8afed881a137ec9a461fed49eca661414be45059329614ed0707"
+                "sha256:203c1fd9d969ab8f2119ec0a3342e0b49910045abe6af0a3ae83a5764d54639e",
+                "sha256:bae794c30d07f6d910d32a7048af09b5a39ed740918da923c6b780790ebac612"
            ],
            "markers": "python_version >= '3.6'",
-            "version": "==0.18.0"
+            "version": "==0.18.2"
        },
        "parso": {
            "hashes": [
-                "sha256:12b83492c6239ce32ff5eed6d3639d6a536170723c6f3f1506869f1ace413398",
-                "sha256:a8c4922db71e4fdb90e0d0bc6e50f9b273d3397925e5e60a717e719201778d22"
+                "sha256:8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0",
+                "sha256:c001d4636cd3aecdaf33cbb40aebb59b094be2a74c556778ef5576c175e19e75"
            ],
            "markers": "python_version >= '3.6'",
-            "version": "==0.8.2"
+            "version": "==0.8.3"
        },
        "prompt-toolkit": {
            "hashes": [
-                "sha256:6076e46efae19b1e0ca1ec003ed37a933dc94b4d20f486235d436e64771dcd5c",
-                "sha256:eb71d5a6b72ce6db177af4a7d4d7085b99756bf656d98ffcc4fecd36850eea6c"
+                "sha256:535c29c31216c77302877d5120aef6c94ff573748a5b5ca5b1b1f76f5e700c73",
+                "sha256:ced598b222f6f4029c0800cefaa6a17373fb580cd093223003475ce32805c35b"
            ],
            "markers": "python_full_version >= '3.6.2'",
-            "version": "==3.0.20"
+            "version": "==3.0.33"
        },
        "ptpython": {
            "hashes": [
-                "sha256:99636899ab0e4d026e2ecc9368269114f387b4bb5411e57f072b0bde724d9f99",
-                "sha256:eafd4ced27ca5dc370881d4358d1ab5041b32d88d31af8e3c24167fe4af64ed6"
+                "sha256:1ec28ba37959e8e6c4880fcf4748ad5c61341d4c1bfd24a38a4d5b97af1f475a",
+                "sha256:a57b9952eac4a12540a4dfb4ccd4a243403eceb27b0d13245b5e4144c8731d32"
            ],
            "index": "pypi",
-            "version": "==3.0.20"
+            "version": "==3.0.21"
        },
        "pygments": {
            "hashes": [
-                "sha256:b8e67fe6af78f492b3c4b3e2970c0624cbf08beb1e493b2c99b9fa1b67a20380",
-                "sha256:f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6"
+                "sha256:56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1",
+                "sha256:f643f331ab57ba3c9d89212ee4a2dabc6e94f117cf4eefde99a0574720d14c42"
            ],
-            "markers": "python_version >= '3.5'",
-            "version": "==2.10.0"
+            "markers": "python_version >= '3.6'",
+            "version": "==2.13.0"
        },
        "wcwidth": {
            "hashes": [
@@ -5,7 +5,12 @@

 Tconnectsync synchronizes data one-way from the Tandem Diabetes t:connect web/mobile application to Nightscout.

-If you have a t:slim X2 pump with the companion t:connect mobile Android or iOS app, this will allow your pump bolus and basal data to be uploaded to [Nightscout](https://github.com/nightscout/cgm-remote-monitor) automatically. The t:connect Android app, by default, uploads pump data to Tandem's servers every hour, [but using this tool you can update the frequency to as low as every five minutes](https://github.com/jwoglom/tconnectpatcher)! This allows for nearly real-time (but not instantaneous) pump data updates, almost like your pump uploads data directly to Nightscout!
+If you have a t:slim X2 pump with the companion t:connect mobile Android or iOS app, this will allow your pump bolus and basal data to be uploaded to [Nightscout](https://github.com/nightscout/cgm-remote-monitor) automatically.
+Together with a CGM uploader, such as [xDrip+](https://github.com/NightscoutFoundation/xDrip) or the official Dexcom mobile app plus Dexcom Share, this allows your CGM _and_ pump data to be automatically uploaded to Nightscout!
+
+If you have an Android phone, you can use [tconnectpatcher](https://github.com/jwoglom/tconnectpatcher) to modify the t:connect Android app to upload more frequently. By default, pump data is uploaded to Tandem's servers every hour, but with tconnectpatcher the frequency can be brought down to **as low as every five minutes**! This allows for nearly real-time (albeit not fully instantaneous) pump data updates, almost like your pump uploads data directly to Nightscout!
+
+## How It Works

 At a high level, tconnectsync works by querying Tandem's undocumented APIs to receive basal and bolus data from t:connect, and then uploads that data as treatment objects to Nightscout. It contains features for checking for new Tandem pump data continuously, and updating that data along with the pump's reported IOB value to Nightscout whenever there is new data.

@@ -16,24 +21,70 @@ When you run the program with no arguments, it performs a single cycle of the fo
 * Merges the basal information received from the two APIs. (If using ControlIQ, then basal information appears only on the ControlIQ API. If not using ControlIQ, it appears only on the legacy API.)
 * Queries Nightscout for the most recently created Temp Basal object by tconnectsync, and uploads all data newer than that.
 * Queries Nightscout for the most recently created Bolus object by tconnectsync, and uploads all data newer than that.
-* Uploads a single Nightscout Activity object representing the current IOB as reported by the pump.

 If run with the `--auto-update` flag, then the application performs the following steps:

 * Queries an API endpoint used only by the t:connect mobile app which returns an internal event ID, corresponding to the most recent event published by the mobile app.
 * Whenever the internal event ID changes (denoting that the mobile app uploaded new data to synchronize), perform all of the above mentioned steps to synchronize data.

+## What Gets Synced
+
+Tconnectsync is composed of individual so-called _synchronization features_, which are elements of data that can be
+synchronized between t:connect data from the pump and Nightscout.
+When setting up tconnectsync, you can choose to configure which synchronization features are enabled and disabled.
+
+Here are a few examples of reasons why you might want to adjust the enabled synchronization features:
+
+* If you currently input boluses into Nightscout manually with comments, then you may wish to _disable the `BOLUS` synchronization feature_ so that there are no duplicated boluses in Nightscout.
+* If you want to see Sleep and Exercise Mode data appear in Nightscout, then you may with to _enable the `PUMP_EVENTS` synchronization feature_.
+
+These synchronization features are enabled by default:
+
+* `BASAL`: Basal data
+* `BOLUS`: Bolus data
+
+The following synchronization features can be optionally enabled:
+
+* `PUMP_EVENTS`: Events reported by the pump. Includes support for the following:
+  * Site/Cartridge Change (occurs for both a site change and a cartridge change)
+  * Empty Cartridge/Pump Shutdown (from my investigation, occurs either when the cartridge runs out of insulin OR you hard-shut off the pump)
+  * User Suspended (occurs when you manually disable insulin delivery)
+  * Exercise Mode (in Nightscout, appears with a start and end time)
+  * Sleep Mode (in Nightscout, appears with a start and end time)
+* `IOB`: Insulin-on-board data. Only the most recent IOB entry is saved to Nightscout, as an "activity". The Nightscout UI does not currently display this information. In order to read this value, you need to query the Nightscout activity API endpoint. If you don't know what that means, then there is no reason to enable this option.
+
+The following synchronization features are under development, [**but are not yet ready for use**](https://github.com/jwoglom/tconnectsync/issues/16):
+* `BOLUS_BG`: Adds BG readings which are associated with boluses on the pump into the Nightscout treatment object. It will determine whether the BG reading was automatically filled via the Dexcom connection on the pump or was manually entered by seeing if the BG reading matches the current CGM reading as known to the pump at that time. Support for this is nearly complete.
+* `CGM`: Adds Dexcom CGM readings from the pump to Nightscout as SGV (sensor glucose value) entries. This should only be used in a situation where xDrip/Dexcom Share/etc. is not used and the pump connection to the CGM will be the only source of CGM data to Nightscout. This requires additional testing before it should be considered ready.
+
+To specify custom synchronization features, pass the names of the desired features to the `--features` flag, e.g.:
+
+```bash
+$ tconnectsync --features BASAL BOLUS PUMP_EVENTS
+```
+
+If you're using tconnectsync-heroku, see [this section in its README](https://github.com/jwoglom/tconnectsync-heroku#Updating-synchronization-features).
+
 ## Setup

-**To get started,** you need to choose whether to install the application via
+The following setup instructions assume that you have a Linux, MacOS, or Windows (with WSL) machine that will run the application continuously.
+
+If you've configured Nightscout before, you may be familiar with Heroku. [You can opt to run tconnectsync with Heroku by following these instructions.](https://github.com/jwoglom/tconnectsync-heroku)
+
+**To get started,** you need to choose whether to install the application on your computer via
 **Pip**, **Pipenv**, or **Docker**.

 After that, you can choose to run the program continuously via **Supervisord**
 or on a regular interval with **Cron**.

+**NOTE:** If you fork the tconnectsync repository on GitHub, **do not commit your .env file**.
+If pushed to GitHub, this will make your tconnect and Nightscout passwords publicly visible and put your data at risk.
+
 ## Installation

-First, create a file named `.env` containing configuration values.
+First, you need to create a file containing configuration values.
+The name of this file will be `.env`, and its location will be dependent on which
+method of installation you choose.
 You should specify the following parameters:

 ```bash
@@ -44,33 +95,54 @@ TCONNECT_PASSWORD='password'
 # Your pump's serial number (numeric)
 PUMP_SERIAL_NUMBER=11111111

-# URL and API secret for Nightscout
+# URL of your Nightscout site
 NS_URL='https://yournightscouturl/'
+# Your Nightscout API_SECRET value
 NS_SECRET='apisecret'

 # Current timezone of the pump
 TIMEZONE_NAME='America/New_York'
 ```

-These values can alternatively be specified via environment variables.
+This file contains your t:connect username and password, Tandem pump serial number (which is utilized in API calls to t:connect), your Nightscout URL and secret token (for uploading data to Nightscout), and local timezone (the timezone used in t:connect). When specifying the timezone, enter a [TZ database name value](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).

-The .env file contains your t:connect username and password, Tandem pump serial number (which is utilized in API calls to t:connect), your Nightscout URL and secret token (for uploading data to Nightscout), and local timezone (the timezone used in t:connect).
+(Alternatively, these values can be specified via environment variables.)

 ### Installation via Pip

 This is the easiest method to install.

-First, ensure that you have **Python 3** with **Pip** installed on your
-Linux machine. Then, install tconnectsync from pip:
+First, ensure that you have **Python 3** with **Pip** installed:
+
+* **On MacOS:** Open Terminal. Install [Homebrew](https://brew.sh/), and then run `brew install python3`
+* **On Linux:** Follow your distribution's specific instructions.
+  - For Debian/Ubuntu based distros, `sudo apt install python3 python3-pip`
+  - For CentOS/Rocky Linux 8: 
+    - `sudo dnf install python39-pip`
+    - `sudo alternatives --set python /usr/bin/python3.9` 
+* **On Windows:** Install Ubuntu under the [Windows Subsystem for Linux](https://ubuntu.com/wsl).
+  Open the Ubuntu Terminal, then run `sudo apt install python3 python3-pip`.
+  Perform the remainder of the steps under the Ubuntu environment.
+
+Now install the `tconnectsync` package with pip:

 ```
 $ pip3 install tconnectsync
 ```
+To install into a user environment instead of system-wide for a more contained install:
+````
+$ pip3 install --user tconnectsync
+````
+  - This will place the tconnectsync binary file at ``/home/<username>/.local/bin/tconnectsync``
+
+
+If the pip3 command is not found, run `python3 -m pip install tconnectsync` instead.

 After this, you should be able to view tconnectsync's help with:
 ```
 $ tconnectsync --help
 usage: tconnectsync [-h] [--version] [--pretend] [-v] [--start-date START_DATE] [--end-date END_DATE] [--days DAYS] [--auto-update] [--check-login]
+               [--features {BASAL,BOLUS,IOB,PUMP_EVENTS} [{BASAL,BOLUS,IOB,PUMP_EVENTS} ...]]

 Syncs bolus, basal, and IOB data from Tandem Diabetes t:connect to Nightscout.

@@ -85,9 +157,16 @@ optional arguments:
  --days DAYS           The number of days of t:connect data to read in. Cannot be used with --from-date and --until-date.
  --auto-update         If set, continuously checks for updates from t:connect and syncs with Nightscout.
  --check-login         If set, checks that the provided t:connect credentials can be used to log in.
+  --features {BASAL,BOLUS,IOB,PUMP_EVENTS} [{BASAL,BOLUS,IOB,PUMP_EVENTS} ...]
+                        Specifies what data should be synchronized between tconnect and Nightscout.
 ```

-Go to the folder where you created the `.env` file, and run:
+Move the `.env` file you created to the following folder:
+
+* **MacOS:** `/Users/<username>/.config/tconnectsync/.env`
+* **Linux:** `$HOME/.config/tconnectsync/.env`
+* **Windows:** `$HOME/.config/tconnectsync/.env` (inside WSL)
+
 ```
 $ tconnectsync --check-login
 ```
@@ -116,6 +195,7 @@ $ pip3 install pipenv
 $ pipenv install
 $ pipenv run tconnectsync --help
 usage: main.py [-h] [--version] [--pretend] [-v] [--start-date START_DATE] [--end-date END_DATE] [--days DAYS] [--auto-update] [--check-login]
+               [--features {BASAL,BOLUS,IOB,PUMP_EVENTS} [{BASAL,BOLUS,IOB,PUMP_EVENTS} ...]]

 Syncs bolus, basal, and IOB data from Tandem Diabetes t:connect to Nightscout.

@@ -130,10 +210,13 @@ optional arguments:
  --days DAYS           The number of days of t:connect data to read in. Cannot be used with --from-date and --until-date.
  --auto-update         If set, continuously checks for updates from t:connect and syncs with Nightscout.
  --check-login         If set, checks that the provided t:connect credentials can be used to log in.
+  --features {BASAL,BOLUS,IOB,PUMP_EVENTS} [{BASAL,BOLUS,IOB,PUMP_EVENTS} ...]
+                        Specifies what data should be synchronized between tconnect and Nightscout.
 ```


-Move the `.env` file you created earlier into this folder, and run:
+Move the `.env` file you created earlier into the `tconnectsync` folder, and run:
+
 ```
 $ pipenv run tconnectsync --check-login
 ```
@@ -151,6 +234,17 @@ $ docker pull ghcr.io/jwoglom/tconnectsync/tconnectsync:latest
 $ docker run ghcr.io/jwoglom/tconnectsync/tconnectsync --help
 ```

+Move the `.env` file you created earlier into the current folder, and run:
+
+```
+$ docker run tconnectsync --check-login
+```
+
+If you receive no errors, then you can move on to the **Running Tconnectsync Continuously** section.
+
+
+#### Building Locally
+
 To instead build the image locally and launch the project:

 ```bash
@@ -162,9 +256,11 @@ $ docker run tconnectsync --help

 Move the `.env` file you created earlier into this folder, and run:
 ```
-$ docker run tconnectsync --check-login
+$ docker run --env-file=.env tconnectsync --check-login
 ```

+**NOTE:** If using the `--env-file` option to `docker run`, you may need to remove all quotation marks (`'` and `"`s) around values in the `.env` file for Docker to propagate the variables correctly.
+
 If you receive no errors, then you can move on to the **Running Tconnectsync Continuously** section.

 ## Running Tconnectsync Continuously
@@ -290,22 +386,27 @@ invoking tconnectsync with no arguments via cron.

 If using Pipenv or a virtualenv, make sure that you either prefix the call to main.py with `pipenv run` or source the `bin/activate` file within the virtualenv, so that the proper dependencies are loaded. If not using any kind of virtualenv, you can instead just install the necessary dependencies as specified inside Pipfile globally.

-An example configuration in `/etc/crontab` which runs every 15 minutes:
+An system-wide example configuration in `/etc/crontab` which runs every 15 minutes, on the 15 minute mark:

 ```bash
 # m         h  dom mon dow user   command
 0,15,30,45  *  *   *   *   root   /path/to/tconnectsync/run.sh
 ```

+An example of a user crontab `crontab -e` if not running system-wide, which runs every 15 minutes:
+```
+*/15 * * * * /path/to/tconnectsync/run.sh
+```
+
 You can use one of the same `run.sh` files referenced above, but remove the `--auto-update` flag since you are handling the functionality for running the script periodically yourself.

 ## Tandem APIs

 This application utilizes three separate Tandem APIs for obtaining t:connect data, referenced here by the identifying part of their URLs:

-* [**controliq**](https://github.com/jwoglom/tconnectsync/blob/master/tconnectsync/api/controliq.py) - Contains Control:IQ related data, namely a timeline of all Basal events uploaded by the pump, separated by type (temp basals, algorithmically-updated basals, or profile-updated basals).
+* [**controliq**](https://github.com/jwoglom/tconnectsync/blob/master/tconnectsync/api/controliq.py) - Contains Control:IQ related data, namely a timeline of all Basal events uploaded by the pump, separated by type (temp basals, algorithmically-updated basals, or profile-updated basals). Additionally includes CGM and Bolus data.
 * [**android**](https://github.com/jwoglom/tconnectsync/blob/master/tconnectsync/api/android.py) - Used internally by the t:connect Android app, these API endpoints were discovered by reverse-engineering the Android app. Most of the API endpoints are used for uploading pump data, and tconnectsync uses one endpoint which returns the most recent event ID uploaded by the pump, so we know when more data has been uploaded.
-* [**tconnectws2**](https://github.com/jwoglom/tconnectsync/blob/master/tconnectsync/api/ws2.py) - More legacy than the others, this seems to power the bulk of the main t:connect website. It is used to retrieve a CSV export of non-ControlIQ basal data, as well as bolus and IOB data. (I haven't found any mentions of bolus or IOB data in the Control:IQ-specific API.)
+* [**tconnectws2**](https://github.com/jwoglom/tconnectsync/blob/master/tconnectsync/api/ws2.py) - More legacy than the others, this seems to power the bulk of the main t:connect website. It is used as a last resort due to severe performance issues with this API (see https://github.com/jwoglom/tconnectsync/issues/43). We can use it to retrieve a CSV export of non-ControlIQ basal data, as well as bolus and IOB data. It is only used for bolus data as a fallback, and for pump-reported IOB data if requested. Full tracking of pump events also uses a limited version of this API.

 I have only tested tconnectsync with a Tandem pump set in the US Eastern timezone. Tandem's (to us, undocumented) APIs are [a bit loose with timezones](https://github.com/jwoglom/tconnectsync/blob/master/tconnectsync/parser.py#L15), so please let me know if you notice any timezone-related bugs.
 ## Backfilling t:connect Data
@@ -319,3 +420,15 @@ python3 main.py --start-date 2020-01-01 --end-date 2020-03-01
 In order to bulk-import a lot of data, you may need to use shorter intervals, and invoke tconnectsync multiple times. Tandem's API endpoints occasionally return invalid data if you request too large of a data window which causes tconnectsync to error out mid-way through.

 One oddity when backfilling data is that the Control:IQ specific API endpoints return errors if they are queried before you updated your pump to utilize Control:IQ. This is [partially worked around in tconnectsync's code](https://github.com/jwoglom/tconnectsync/blob/d841c3811aeff3671d941a7d3ff4b80cce6a219e/main.py#L238), but you might need to update the logic if you did not switch to a Control:IQ enabled pump immediately after launch.
+
+## t:connect API Testing
+
+To test t:connect API endpoints in a Python shell, you can do something like the following:
+
+```python
+import tconnectsync
+tconnectsync.util.cli.enable_logging()
+api = tconnectsync.util.cli.get_api()
+# Make API calls, e.g.
+therapy_timeline = api.controliq.therapy_timeline('2022-08-01', '2022-08-10')
+```
@@ -0,0 +1,6 @@
+coverage:
+  status:
+    project:
+      default:
+        target: 50%
+        threshold: null
@@ -1,6 +1,6 @@
 [metadata]
 name = tconnectsync
-version = 0.5
+version = 0.8.7
 author = James Woglom 
 author_email = j@wogloms.net
 description = Syncs Tandem t:connect pump data to Nightscout for the t:slim X2
@@ -18,7 +18,7 @@ classifiers =
 package_dir =
    = .
 packages = find:
-python_requires = >=3.6
+python_requires = >=3.7
 install_requires =
    requests
    bs4
@@ -34,4 +34,4 @@ exclude =

 [options.entry_points]
 console_scripts =
-    tconnectsync = tconnectsync:main
+    tconnectsync = tconnectsync:main
@@ -7,7 +7,7 @@ import pkg_resources

 from .api import TConnectApi
 from .process import process_time_range
-from .autoupdate import process_auto_update
+from .autoupdate import Autoupdate
 from .check import check_login
 from .nightscout import NightscoutApi
 from .features import DEFAULT_FEATURES, ALL_FEATURES
@@ -17,8 +17,10 @@ try:
        TCONNECT_EMAIL,
        TCONNECT_PASSWORD,
        NS_URL,
-        NS_SECRET
+        NS_SECRET,
+        NS_SKIP_TLS_VERIFY
    )
+    from . import secret
 except Exception:
    print('Unable to read secret.py')
    sys.exit(1)
@@ -30,7 +32,7 @@ except Exception:
    __version__ = "UNKNOWN"

 def parse_args(*args, **kwargs):
-    parser = argparse.ArgumentParser(description="Syncs bolus, basal, and IOB data from Tandem Diabetes t:connect to Nightscout.")
+    parser = argparse.ArgumentParser(description="Syncs bolus, basal, and IOB data from Tandem Diabetes t:connect to Nightscout.", epilog="Version %s" % __version__)
    parser.add_argument('--version', action='version', version='tconnectsync %s' % __version__)
    parser.add_argument('--pretend', dest='pretend', action='store_const', const=True, default=False, help='Pretend mode: do not upload any data to Nightscout.')
    parser.add_argument('-v', '--verbose', dest='verbose', action='store_const', const=True, default=False, help='Verbose mode: show extra logging details')
@@ -73,7 +75,7 @@ def main(*args, **kwargs):

    tconnect = TConnectApi(TCONNECT_EMAIL, TCONNECT_PASSWORD)

-    nightscout = NightscoutApi(NS_URL, NS_SECRET)
+    nightscout = NightscoutApi(NS_URL, NS_SECRET, NS_SKIP_TLS_VERIFY)

    if args.check_login:
        return check_login(tconnect, time_start, time_end)
@@ -82,7 +84,8 @@ def main(*args, **kwargs):

    if args.auto_update:
        print("Starting auto-update between", time_start, "and", time_end, "(PRETEND)" if args.pretend else "")
-        process_auto_update(tconnect, nightscout, time_start, time_end, args.pretend, features=args.features)
+        u = Autoupdate(secret)
+        sys.exit(u.process(tconnect, nightscout, time_start, time_end, args.pretend, features=args.features))
    else:
        print("Processing data between", time_start, "and", time_end, "(PRETEND)" if args.pretend else "")
        added = process_time_range(tconnect, nightscout, time_start, time_end, args.pretend, features=args.features)
@@ -3,6 +3,7 @@ import logging
 from .android import AndroidApi
 from .controliq import ControlIQApi
 from .ws2 import WS2Api
+from .webui import WebUIScraper

 logger = logging.getLogger(__name__)

@@ -11,13 +12,13 @@ class TConnectApi:
    email = None
    password = None

-    _ciq = None
-    _ws2 = None
-    _android = None
-
    def __init__(self, email, password):
        self.email = email
        self.password = password
+        self._ciq = None
+        self._ws2 = None
+        self._android = None
+        self._webui = None


    @property
@@ -53,4 +54,14 @@ class TConnectApi:

        self._android = AndroidApi(self.email, self.password)
        return self._android
+    
+    @property
+    def webui(self):
+        if self._webui and not self._webui.needs_relogin():
+            return self._webui
+        
+        logger.debug("Instantiating new WebUIScraper")
+
+        self._webui = WebUIScraper(self.controliq)
+        return self._webui

@@ -11,7 +11,7 @@ import logging
 from bs4 import BeautifulSoup

 from ..util import timeago
-from .common import ApiException, ApiLoginException
+from .common import ApiException, ApiLoginException, parse_date, base_session

 logger = logging.getLogger(__name__)

@@ -29,6 +29,8 @@ class AndroidApi:
    ANDROID_API_USERNAME = base64.b64decode('QzIzMzFDRDYtRDQ1MC00OTVFLTlDMTktNjcyMTUyMzBDODVD').decode()
    ANDROID_API_PASSWORD = base64.b64decode('dHo0MzNLVzVRREM5VjdmIXo2QF4ybyZZNlNHR1lo').decode()

+    ANDROID_USER_AGENT = 'Dalvik/2.1.0 (Linux; U; Android 12; Pixel 4a Build/SP2A.220305.012)'
+
    # These tokens are separate from the "standard" tdcservices API
    accessToken = None
    accessTokenExpiresAt = None
@@ -38,12 +40,13 @@ class AndroidApi:
    patientObjectId = None

    def __init__(self, email, password):
+        self.session = base_session()
        self.login(email, password)
        self._email = email
        self._password = password

    def login(self, email, password):
-        r = requests.post(
+        r = self.session.post(
            self.BASE_URL + self.OAUTH_TOKEN_PATH,
            {
                'username': email,
@@ -51,7 +54,10 @@ class AndroidApi:
                'grant_type': 'password',
                'scope': self.OAUTH_SCOPES
            },
-            headers={'Content-Type': 'application/x-www-form-urlencoded'},
+            headers={
+                'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
+                'User-Agent': self.ANDROID_USER_AGENT
+            },
            auth=requests.auth.HTTPBasicAuth(self.ANDROID_API_USERNAME, self.ANDROID_API_PASSWORD)
        )

@@ -82,7 +88,11 @@ class AndroidApi:
        return {'Authorization': 'Bearer %s' % self.accessToken}

    def _get(self, endpoint, query={}, **kwargs):
-        r = requests.get(self.BASE_URL + endpoint, query, headers=self.api_headers(), **kwargs)
+        r = self.session.get(self.BASE_URL + endpoint, data=query, headers={
+            'User-Agent': self.ANDROID_USER_AGENT,
+            'Content-Type': 'application/json',
+            **self.api_headers()
+        }, **kwargs)

        if r.status_code != 200:
            raise ApiException(r.status_code, "Android API HTTP %s response: %s" % (str(r.status_code), r.text))
@@ -109,7 +119,7 @@ class AndroidApi:


    def post(self, endpoint, query={}, **kwargs):
-        r = requests.post(self.BASE_URL + endpoint, query, headers=self.api_headers(), **kwargs)
+        r = self.session.post(self.BASE_URL + endpoint, query, headers=self.api_headers(), **kwargs)
        if r.status_code != 200:
            raise ApiException(r.status_code, "Internal API HTTP %s response: %s" % (str(r.status_code), r.text))
        return r.json()
@@ -134,6 +144,9 @@ class AndroidApi:
    # TODO: these methods are used in the web app, not the Android app,
    # but support the same auth tokens and are on this domain. They should
    # be moved to a new Api class.
+    # 3/17/2022: the API appears to be more stringently checking scopes,
+    # and some of these endpoints no longer work with the API token scoped
+    # to the Android app.

    """
    Returns BG and pump threshold values.
@@ -1,12 +1,101 @@
 import datetime
+import requests
+import random
+
+from tconnectsync import secret

 def parse_date(date):
    if type(date) == str:
        return date
    return (date or datetime.datetime.now()).strftime('%m-%d-%Y')

+USER_AGENTS = [
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Safari/537.36',
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36',
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36',
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.0.0 Safari/537.36',
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.54 Safari/537.36',
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.64 Safari/537.36',
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Safari/537.36',
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.115 Safari/537.36',
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.61 Safari/537.36',
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15',
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.3 Safari/605.1.15',
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Safari/605.1.15',
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15',
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:100.0) Gecko/20100101 Firefox/100.0',
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:101.0) Gecko/20100101 Firefox/101.0',
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Firefox/102.0',
+    'Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36 OPR/86.0.4363.64',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36 OPR/86.0.4363.70',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.75 Safari/537.36',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.0.0 Safari/537.36',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.54 Safari/537.36',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.64 Safari/537.36',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.64 Safari/537.36 Edg/101.0.1210.47',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.64 Safari/537.36 Edg/101.0.1210.53',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.67 Safari/537.36',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.67 Safari/537.36 OPR/87.0.4390.45',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Safari/537.36',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.115 Safari/537.36',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.124 Safari/537.36 Edg/102.0.1245.41',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.124 Safari/537.36 Edg/102.0.1245.44',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.61 Safari/537.36',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.62 Safari/537.36',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.63 Safari/537.36',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.63 Safari/537.36 Edg/102.0.1245.30',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.63 Safari/537.36 Edg/102.0.1245.33',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.63 Safari/537.36 Edg/102.0.1245.39',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.84 Safari/537.36 OPR/85.0.4341.71',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:100.0) Gecko/20100101 Firefox/100.0',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:101.0) Gecko/20100101 Firefox/101.0',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0',
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:99.0) Gecko/20100101 Firefox/99.0',
+    'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Safari/537.36',
+    'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36',
+    'Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Safari/537.36',
+    'Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:100.0) Gecko/20100101 Firefox/100.0',
+    'Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:101.0) Gecko/20100101 Firefox/101.0',
+    'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36',
+    'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.0.0 Safari/537.36',
+    'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.41 Safari/537.36',
+    'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.64 Safari/537.36',
+    'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Safari/537.36',
+    'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.115 Safari/537.36',
+    'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.61 Safari/537.36',
+    'Mozilla/5.0 (X11; Linux x86_64; rv:100.0) Gecko/20100101 Firefox/100.0',
+    'Mozilla/5.0 (X11; Linux x86_64; rv:101.0) Gecko/20100101 Firefox/101.0',
+    'Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Firefox/91.0',
+    'Mozilla/5.0 (X11; Linux x86_64; rv:95.0) Gecko/20100101 Firefox/95.0',
+    'Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101 Firefox/99.0',
+    'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:100.0) Gecko/20100101 Firefox/100.0',
+    'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:101.0) Gecko/20100101 Firefox/101.0'
+]
+
+# Consistent for entire runtime
+random_ua = random.choice(USER_AGENTS)
 def base_headers():
-    return {'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.182 Safari/537.36'}
+    return {'user-agent': random_ua}
+
+def base_session():
+    s = requests.Session()
+    if secret.REQUESTS_PROXY:
+        def wrapped_request(self, *args, **kwargs):
+            if not kwargs:
+                kwargs = {}
+            kwargs['proxies'] = {
+                'http': secret.REQUESTS_PROXY,
+                'https': secret.REQUESTS_PROXY
+            }
+            return self._original_request(*args, **kwargs)
+
+        s._original_request = s.request
+        s.request = wrapped_request.__get__(s, requests.Session)
+    return s

 class ApiException(Exception):
    def __init__(self, status_code, text, *args, **kwargs):
@@ -1,6 +1,4 @@
-import requests
 import urllib
-import datetime
 import arrow
 import time
 import logging
@@ -8,17 +6,20 @@ import logging
 from bs4 import BeautifulSoup

 from ..util import timeago
-from .common import parse_date, base_headers, ApiException, ApiLoginException
+from .common import parse_date, base_headers, base_session, ApiException, ApiLoginException

 logger = logging.getLogger(__name__)

 class ControlIQApi:
-    BASE_URL = 'https://tdcservices.tandemdiabetes.com/tconnect/controliq/api/'
+    BASE_URL = 'https://tdcservices.tandemdiabetes.com/'
    LOGIN_URL = 'https://tconnect.tandemdiabetes.com/login.aspx?ReturnUrl=%2f'

+    LAST_CONFIRMED_SOFTWARE_VERSION = 't:connect 7.14.0.1'
+
    userGuid = None
    accessToken = None
    accessTokenExpiresAt = None
+    tconnect_software_ver = None

    def __init__(self, email, password):
        self.login(email, password)
@@ -27,7 +28,7 @@ class ControlIQApi:

    def login(self, email, password):
        logger.info("Logging in to ControlIQApi...")
-        with requests.Session() as s:
+        with base_session() as s:
            initial = s.get(self.LOGIN_URL, headers=base_headers())
            soup = BeautifulSoup(initial.content, features='lxml')
            data = self._build_login_data(email, password, soup)
@@ -45,9 +46,20 @@ class ControlIQApi:
            self.accessToken = req.cookies['accessToken']
            self.accessTokenExpiresAt = req.cookies['accessTokenExpiresAt']
            logger.info("Logged in to ControlIQApi successfully (expiration: %s, %s)" % (self.accessTokenExpiresAt, timeago(self.accessTokenExpiresAt)))
+            self.loginSession = s
            return True

    def _build_login_data(self, email, password, soup):
+        try:
+            version = soup.select_one("#footer_version").text.strip()
+            self.tconnect_software_ver = version
+            logger.info("Reported tconnect software version: %s" % version)
+            if version != self.LAST_CONFIRMED_SOFTWARE_VERSION:
+                logger.warning("Newer API version than last confirmed working. Saw %s and expected %s" % (version, self.LAST_CONFIRMED_SOFTWARE_VERSION))
+                logger.warning("If you experience any issues, please report them to https://github.com/jwoglom/tconnectsync")
+        except Exception:
+            logger.warning("Unable to find tconnect software version")
+            pass
        return {
            "__LASTFOCUS": "",
            "__EVENTTARGET": "ctl00$ContentBody$LoginControl$linkLogin",
@@ -68,10 +80,15 @@ class ControlIQApi:
    def api_headers(self):
        if not self.accessToken:
            raise Exception('No access token provided')
-        return {'Authorization': 'Bearer %s' % self.accessToken, **base_headers()}
+        return {
+            'Authorization': 'Bearer %s' % self.accessToken,
+            'Origin': 'https://tconnect.tandemdiabetes.com',
+            'Referer': 'https://tconnect.tandemdiabetes.com/',
+            **base_headers()
+        }

    def _get(self, endpoint, query):
-        r = requests.get(self.BASE_URL + endpoint, query, headers=self.api_headers())
+        r = base_session().get(self.BASE_URL + endpoint, data=query, headers=self.api_headers())

        if r.status_code != 200:
            raise ApiException(r.status_code, "ControlIQ API HTTP %s response: %s" % (str(r.status_code), r.text))
@@ -101,15 +118,15 @@ class ControlIQApi:

    """
    Returns detailed basal event information and reasons for delivery suspension.
+    End-date inclusive: Returns data from 00:00 on start date to 23:59 on end date.
    """
    def therapy_timeline(self, start=None, end=None):
        startDate = parse_date(start)
        endDate = parse_date(end)

-        return self.get('therapytimeline/users/%s' % (self.userGuid), {
-            "startDate": startDate,
-            "endDate": endDate
-        })
+        # Microsoft-Azure-Application-Gateway/v2 WAF error message appears
+        # if startDate and endDate are not specified in exactly this order.
+        return self.get('tconnect/controliq/api/therapytimeline/users/%s?startDate=%s&endDate=%s' % (self.userGuid, startDate, endDate), {})

    """
    Returns a summary of pump and cgm activity.
@@ -122,14 +139,24 @@ class ControlIQApi:
        startDate = parse_date(start)
        endDate = parse_date(end)

-        return self.get('summary/users/%s' % (self.userGuid), {
-            "startDate": startDate,
-            "endDate": endDate
-        })
+        return self.get('tconnect/controliq/api/summary/users/%s?startDate=%s&endDate=%s' % (self.userGuid, startDate, endDate), {})
    
    """
    Returns active account features, including the date when ControlIQ was enabled.
    [{"serialNumber": "11111111", "features": {"controlIQ": {"feature": 1, "dateTimeFirstDetected": "YYYY-MM-DD:THH:MM:SS", "unixTimestamp": 1111111111}}}]
    """
    def pumpfeatures(self):
-        return self.get('pumpfeatures/users/%s' % self.userGuid, {})
+        return self.get('tconnect/controliq/api/pumpfeatures/users/%s' % self.userGuid, {})
+
+    """
+    Returns therapy events, used by the webui Therapy Timeline.
+    {'event': [
+      {'type': 'Basal', 'basalRate': ...}, 
+      {'type': 'Bolus', 'standard': ...},
+      {'type': 'CGM', 'egv': ...}
+    ]}
+    """
+    def therapy_events(self, start_date=None, end_date=None):
+        startDate = parse_date(start_date)
+        endDate = parse_date(end_date)
+        return self.get('tconnect/therapyevents/api/TherapyEvents/%s/%s/false?userId=%s' % (startDate, endDate, self.userGuid), {})
@@ -0,0 +1,268 @@
+from typing import List
+import requests
+import urllib
+import datetime
+import arrow
+import time
+import logging
+
+from bs4 import BeautifulSoup
+
+from tconnectsync.domain.device_settings import Device, Profile, ProfileSegment
+from tconnectsync.util import removesuffix, removeprefix
+from tconnectsync.util.constants import MMOLL_TO_MGDL
+
+from .common import base_headers, ApiException
+
+logger = logging.getLogger(__name__)
+
+"""
+WebUIScraper contains data that is scraped from the t:connect Web UI and is
+not accessible via any known API.
+"""
+class WebUIScraper:
+    BASE_URL = "https://tconnect.tandemdiabetes.com/"
+
+    def __init__(self, controliq):
+        self.controliq = controliq
+
+    def needs_relogin(self):
+        return self.controliq.needs_relogin()
+
+    def _get(self, endpoint):
+        r = self.controliq.loginSession.get(self.BASE_URL + endpoint, headers=base_headers())
+
+        if r.status_code != 200:
+            raise ApiException(r.status_code, "WebUIScraper HTTP %s response: %s" % (str(r.status_code), r.text))
+        return r
+
+
+    def get(self, endpoint, tries=0):
+        try:
+            return self._get(endpoint)
+        except ApiException as e:
+            logger.warning("Received ApiException in WebUIScraper with endpoint '%s' (tries %d): %s" % (endpoint, tries, e))
+            if tries > 0:
+                raise ApiException(e.status_code, "WebUIScraper HTTP %d on retry #%d: %s", e.status_code, tries, e)
+
+            # Trigger automatic re-login, and try again once
+            if e.status_code == 401:
+                logger.info("Performing automatic re-login to ControlIQApi after HTTP 401 for ControlIQApi")
+                self.controliq.accessTokenExpiresAt = time.time()
+                self.controliq.login(self.controliq._email, self.controliq._password)
+
+                return self.get(endpoint, tries=tries+1)
+
+            if e.status_code == 500:
+                return self.get(endpoint, tries=tries+1)
+
+            raise e
+    
+    def strip(self, txt):
+        # Remove errant whitespace between litearl newlines (and literal &nbsp;)
+        sep = '\r\n'
+        if sep not in txt and '\n' in txt:
+            sep = '\n'
+        return ' '.join([i.replace('\xa0',' ').strip() for i in txt.strip().split(sep)])
+
+    
+    """
+    Returns a mapping between pump/device IDs and information about that device,
+    including the GUID used for obtaining pump settings.
+    """
+    def my_devices(self):
+        devices = {}
+        r = self.get('myaccount/my_devices.aspx')
+        soup = BeautifulSoup(r.content, features='lxml')
+
+        for device in soup.select('#content > div.box'):
+            device_name = self.strip(device.select_one('.subTitle').text)
+
+            def find_label_value(lbl):
+                label = device.find(text=lbl)
+                if label:
+                    tds = label.parent.parent.parent.select('td')
+                    if len(tds) > 1:
+                        return self.strip(tds[1].text)
+                return None
+            
+            serial_number = find_label_value('Serial #')
+            model_number = find_label_value('Model #')
+            status = find_label_value('Status')
+
+            settings_span = device.find(text='View Settings')
+            settings_guid = None
+            if settings_span:
+                settings_a = settings_span.parent.parent
+                settings_guid = settings_a.attrs['href'].split('?guid=')[1]
+            
+            if serial_number:
+                devices[serial_number] = Device(
+                    name=device_name,
+                    model_number=model_number,
+                    status=status,
+                    guid=settings_guid)
+        
+        return devices
+    
+    """
+    Returns a parsed representation of a pump's settings.
+    Note that pump_guid is NOT the serial number of the pump, and
+    should be obtained from my_devices()[str(serial_number)]['guid']
+    """
+    def device_settings_from_guid(self, pump_guid: str) -> List[Profile]:
+        profiles = []
+        settings = {}
+        r = self.get('myaccount/DeviceSettings.aspx?guid=%s' % pump_guid)
+        soup = BeautifulSoup(r.content, features='lxml')
+        settings["upload_date"] = self.strip(soup.select_one('#lblUploadDate').text)
+
+        divxml = soup.select_one('#divXML')
+        divxmlDiv = divxml.findChild('div')
+        for tbl in divxmlDiv.findChildren('table', recursive=False):
+            setting_bg = tbl.select_one('.setting_bg')
+            if setting_bg and self.strip(setting_bg.text) == 'Profile':
+                profiles.append(self._parse_profile_tbl(tbl))
+            else:
+                settings.update(self._parse_settings_tbl(tbl))
+        
+        return profiles, settings
+    
+    def _parse_profile_tbl(self, tbl) -> Profile:
+        profile = {}
+        profile["title"] = self.strip(tbl.select_one('.setting_title').text)
+        profile["active"] = bool(tbl.find(text='Active at the time of upload'))
+        profile["segments"] = []
+
+        def parse_basal_rate(rate) -> float:
+            return float(removesuffix(rate, ' u/hr'))
+        
+        def parse_factor(ratio) -> int:
+            return parse_bg_mgdl(removeprefix(ratio, '1u:'))
+
+        def parse_ratio(ratio) -> float:
+            return float(removesuffix(removeprefix(ratio, '1u:'), ' g'))
+        
+        def parse_bg_mgdl(bg) -> int:
+            if bg.endswith(' mg/dL'):
+                return float(removesuffix(bg, ' mg/dL'))
+            elif bg.endswith(' mmol/L'):
+                return float(removesuffix(bg, ' mmol/L')) * MMOLL_TO_MGDL
+            raise ValueError(bg)
+        
+        def hours_to_mins(text) -> int:
+            hrmin = removesuffix(text, " hours")
+            hr, min = hrmin.split(":", 1)
+            return int(min) + int(hr)*60
+
+        for tr in tbl.select('tr'):
+            # Skip header rows
+            if tr.select_one('.setting_bg'):
+                continue
+            if tr.find(text='Start Time'):
+                continue
+            
+            tds = tr.select('td')
+            def is_time_row(td):
+                txt = self.strip(td.select_one('strong').text)
+                return " AM" in txt or " PM" in txt or txt in ("Midnight", "Noon")
+
+            if len(tds) > 0 and is_time_row(tds[0]):
+                display_time = self.strip(tds[0].text)
+                t = display_time
+                if display_time == "Midnight":
+                    t = "12:00 AM"
+                elif display_time == "Noon":
+                    t = "12:00 PM"
+
+                segment = {
+                    "display_time": display_time,
+                    "time": t,
+                    "basal_rate": parse_basal_rate(self.strip(tds[1].text)),
+                    "correction_factor": parse_factor(self.strip(tds[2].text)),
+                    "carb_ratio": parse_ratio(self.strip(tds[3].text)),
+                    "target_bg_mgdl": parse_bg_mgdl(self.strip(tds[4].text))
+                }
+                profile["segments"].append(ProfileSegment(**segment))
+                continue
+            
+            if tr.find(text='Calculated Total Daily Basal'):
+                profile["calculated_total_daily_basal"] = float(removesuffix(self.strip(tds[1].text), " units"))
+                continue
+            
+            # Last row
+            if tr.find(text='Duration of Insulin:'):
+                lastrow = self.strip(tr.text)
+                for part in lastrow.split(' |'):
+                    if len(part) < 1:
+                        continue
+
+                    key, val = part.split(': ')
+                    key = self.strip(key)
+                    val = self.strip(val)
+                    if key == 'Duration of Insulin':
+                        profile["insulin_duration_min"] = hours_to_mins(val)
+                    elif key == 'Carbohydrates':
+                        profile["carbs_enabled"] = self.strip(val.lower()) == "on"
+
+
+        return Profile(**profile)
+
+    def _parse_settings_tbl(self, tbl):
+        outer_tr = tbl.select('tr')[2]
+
+        settings = {}
+        def loop(td, subhead):
+            settings[subhead] = {}
+            for tr in td.select('.settingstable > tr'):
+                if not tr.select_one('strong'):
+                    continue
+
+                key = self.strip(tr.select_one('strong').text)
+
+                tds = tr.select('td')
+                if len(tds) == 1:
+                    subhead = key
+                    settings[subhead] = {}
+                    continue
+
+                val_text = self.strip(tds[1].text)
+                val = {}
+                if tds[1].find(text=' - '):
+                    val['value'] = False
+                elif tds[1].find(text='Off'):
+                    val['value'] = False
+                    val_text = self.strip(val_text.split('Off', 1)[1])
+                elif tds[1].find(text='On'):
+                    val['value'] = True
+                    val_text = self.strip(val_text.split('On', 1)[1])
+
+                val['text'] = val_text
+                settings[subhead][key] = val
+
+        children = outer_tr.findChildren('td', recursive=False)
+        loop(children[0], 'Alerts')
+        loop(children[1], 'Pump Settings')
+
+        return settings
+    
+    """
+    Wraps a call to my_devices to identify the device GUID from the
+    given pump serial, and then returns device_settings_from_guid.
+    """
+    def device_settings(self, pump_serial):
+        devices = self.my_devices()
+        if str(pump_serial) in devices.keys():
+            dev = devices[str(pump_serial)]
+            return self.device_settings_from_guid(dev['guid'])
+        
+        raise RuntimeError('Unable to find pump with serial number: %s. Known devices: %s' % (pump_serial, devices))
+
+
+
+
+
+
+
+
+                
@@ -3,8 +3,9 @@ import datetime
 import csv
 import logging
 import time
+import json

-from .common import parse_date, base_headers, ApiException
+from .common import base_session, parse_date, base_headers, ApiException

 logger = logging.getLogger(__name__)

@@ -18,15 +19,16 @@ class WS2Api:

    def __init__(self, userGuid):
        self.userGuid = userGuid
+        self.session = base_session()

-    def get(self, endpoint, query):
-        r = requests.get(self.BASE_URL + endpoint, query, headers=base_headers())
+    def get(self, endpoint, **kwargs):
+        r = self.session.get(self.BASE_URL + endpoint, headers=base_headers(), **kwargs)
        if r.status_code != 200:
            raise ApiException(r.status_code, "WS2 API HTTP %s response: %s" % (str(r.status_code), r.text))
        return r.text

-    def get_jsonp(self, endpoint):
-        r = requests.get(self.BASE_URL + endpoint, {'callback': 'cb'}, headers=base_headers())
+    def get_jsonp(self, endpoint, **kwargs):
+        r = self.session.get(self.BASE_URL + endpoint + '?callback=cb', headers=base_headers(), **kwargs)
        if r.status_code != 200:
            raise ApiException(r.status_code, "WS2 API HTTP %s response: %s" % (str(r.status_code), r.text))

@@ -36,7 +38,7 @@ class WS2Api:
        if t.endswith(')'):
            t = t[:-1]

-        return t
+        return json.loads(t)

    def _split_empty_sections(self, text):
        sections = [[]]
@@ -69,13 +71,16 @@ class WS2Api:
    Basal data does NOT appear for the specified time range if using Control-IQ.
    The ControlIQ API endpoints must be used for basal data instead.
    However, all other fields are still accessed via this endpoint.
+
+    This has its own built-in retry logic because Tandem's frontend serving
+    the API returns 500s when its backend times out.
    """
    def therapy_timeline_csv(self, start=None, end=None, tries=0):
        startDate = parse_date(start)
        endDate = parse_date(end)

        try:
-            req_text = self.get('therapytimeline2csv/%s/%s/%s?format=csv' % (self.userGuid, startDate, endDate), {})
+            req_text = self.get('therapytimeline2csv/%s/%s/%s?format=csv' % (self.userGuid, startDate, endDate), timeout=10)
        except ApiException as e:
            # This seems to occur as some kind of soft rate-limit.
            logger.warning("Received ApiException in therapy_timeline_csv: (retry count %d) %s" % (tries, e))
@@ -122,6 +127,8 @@ class WS2Api:
     - "manual"
     - "previous"
     - "alarm"
+    
+    End-date inclusive: Returns data from 00:00 on start date to 23:59 on end date.

    {"BasalSuspension":[{"EventDateTime":"/Date(EPOCH_MS-0000)/", "SuspendReason": "reason"}]}
    """
@@ -130,7 +137,7 @@ class WS2Api:
        endDate = parse_date(end)
        arg = "filterbasal/1" if filterbasal else ""

-        return self.get_jsonp('basalsuspension/%s/%s/%s/%s' % (self.userGuid, startDate, endDate, arg))
+        return self.get_jsonp('basalsuspension/%s/%s/%s/%s' % (self.userGuid, startDate, endDate, arg), timeout=10)

    """
    Returns info on BasalIQ in JSONP format.
@@ -139,4 +146,4 @@ class WS2Api:
        startDate = parse_date(start)
        endDate = parse_date(end)

-        return self.get_jsonp('basaliqtech/%s/%s/%s' % (self.userGuid, startDate, endDate))
+        return self.get_jsonp('basaliqtech/%s/%s/%s' % (self.userGuid, startDate, endDate), timeout=10)
@@ -1,95 +1,207 @@
 import time
 import logging
+import datetime
 import sys

 from .process import process_time_range
 from .features import DEFAULT_FEATURES
-from .secret import (
-    PUMP_SERIAL_NUMBER,
-    AUTOUPDATE_DEFAULT_SLEEP_SECONDS,
-    AUTOUPDATE_MAX_SLEEP_SECONDS,
-    AUTOUPDATE_USE_FIXED_SLEEP,
-    AUTOUPDATE_FAILURE_MINUTES,
-    AUTOUPDATE_RESTART_ON_FAILURE
-)
+from . import secret

 logger = logging.getLogger(__name__)

-"""
-Performs the auto-update functionality. Runs indefinitely in a loop
-until stopped (ctrl+c).
-"""
-def process_auto_update(tconnect, nightscout, time_start, time_end, pretend, features=DEFAULT_FEATURES):
-    # Read from android api, find exact interval to cut down on API calls
-    # Refresh API token. If failure, die, have wrapper script re-run.
+class Autoupdate:
+    """Wrap access to secrets for easier testing."""
+    def __init__(self, secret):
+        self.secret = secret
+        self.autoupdate_invocations = 0
+        self.last_event_index = None
+        self.last_event_time = None
+        self.last_successful_process_time_range = None
+        self.time_diffs_between_updates = []
+        self.last_attempt_time = None
+        self.time_diffs_between_attempts = []

-    last_event_index = None
-    last_event_time = None
-    last_process_time_range = None
-    time_diffs = []
-    while True:
-        last_event = tconnect.android.last_event_uploaded(PUMP_SERIAL_NUMBER)
-        if not last_event_index or last_event['maxPumpEventIndex'] > last_event_index:
+    """
+    Performs the auto-update functionality. Runs indefinitely in a loop
+    until stopped (ctrl+c), or a maximum of AUTOUPDATE_MAX_LOOP_INVOCATIONS times.
+    Stops if AUTOUPDATE_RESTART_ON_FAILURE is set and an error occurs.
+    """
+    def process(self, tconnect, nightscout, time_start, time_end, pretend, features=None):
+        if features is None:
+            features = DEFAULT_FEATURES
+       
+        # Read from android api, find exact interval to cut down on API calls
+        # Refresh API token. If failure, die, have wrapper script re-run.
+
+        self.autoupdate_start = time.time()
+
+        while True:
+            logger.debug("autoupdate loop")
            now = time.time()
-            logger.info('New reported t:connect data. (event index: %s last: %s)' % (last_event['maxPumpEventIndex'], last_event_index))
+            last_event = tconnect.android.last_event_uploaded(self.secret.PUMP_SERIAL_NUMBER)
+            if not self.last_event_index or last_event['maxPumpEventIndex'] > self.last_event_index:
+                logger.info('New reported t:connect data. (event index: %s last: %s)' % (last_event['maxPumpEventIndex'], self.last_event_index))

-            if pretend:
-                logger.info('Would update now if not in pretend mode')
-            else:
-                added = process_time_range(tconnect, nightscout, time_start, time_end, pretend, features=features)
-                logger.info('Added %d items from process_time_range' % added)
-                if added == 0:
-                    if last_event_index:
-                        logger.error('An event index change was recorded, but no new data was found via the API. ' +
-                                     'If this error reoccurs, try restarting tconnectsync.')
+                if pretend:
+                    logger.info('Would update now if not in pretend mode')
                else:
-                    last_process_time_range = now
+                    added = process_time_range(tconnect, nightscout, time_start, time_end, pretend, features=features)
+                    logger.info('Added %d items from process_time_range' % added)
+                    if added == 0:
+                        # If we've been unable to find new events, but the last_event_index is increasing,
+                        # suggesting there are more events being added, we might be in a bugged
+                        # situation where we can't get any more data without restarting.
+                        # We skip this check on the first process cycle, since we might
+                        # just already be in sync with tconnect's pump data.
+                        if self.last_event_index:
+
+                            # Find the timestamp of the last time we've successfully obtained data, 
+                            # or the time when the autoupdate run started, if we haven't at all.
+                            last_action_or_start = self.last_successful_process_time_range
+                            if not last_action_or_start:
+                                last_action_or_start = self.autoupdate_start
+
+                            # If it's been AUTOUPDATE_FAILURE_MINUTES in the state of not seeing
+                            # event index changes reflected in the tconnect data we're pulling,
+                            # raise an error and potentially restart.
+                            # This is likely a tconnectsync problem, not a problem with the pump or app
+                            # (we can see the indexes increasing, so we know something's happening!)
+                            if (now - last_action_or_start) >= 60 * self.secret.AUTOUPDATE_FAILURE_MINUTES:
+                                logger.error(AutoupdateFailureError(
+                                        ("%s: An event index change was recorded, but no new data was found via the API. " % datetime.datetime.now()) +
+                                        "The %s was %d minutes ago. This is a problem with tconnectsync." % 
+                                        ("last processed event" if self.last_successful_process_time_range else "start of autoupdate", (now - last_action_or_start)//60)))
+
+                                if self.secret.AUTOUPDATE_RESTART_ON_FAILURE:
+                                    logger.error("Exiting with error code due to AUTOUPDATE_RESTART_ON_FAILURE")
+                                    return 1
+                            else:
+                                logger.warning(AutoupdateFailureWarning(("%s: An event index change was recorded, but no new data was found via the API. " % datetime.datetime.now()) +
+                                            "The %s was %d minutes ago. Resetting TConnectApi to attempt to solve this problem." % 
+                                            ("last processed event" if self.last_successful_process_time_range else "start of autoupdate", (now - last_action_or_start)//60)))
+                                
+                                # As a stop-gap, try to re-initialize TConnectApi (triggering a re-login)
+                                # Use __class__ instead of direct TConnectApi invocation to avoid initializing a real TConnectApi over a fake
+                                tconnect = tconnect.__class__(self.secret.TCONNECT_EMAIL, self.secret.TCONNECT_PASSWORD)
+                    else:
+                        # Mark the last successful time we got data from tconnect
+                        self.last_successful_process_time_range = now


-            if last_event_index:
-                time_diffs.append(now - last_event_time)
-                logger.debug('Updating tracking of time since last update: %s' % time_diffs)
+                # Track the time it took to find a new event between runs,
+                # but skip this calculation the first process cycle (since
+                # we don't know at what exact point the event index changed)
+                if self.last_event_index:
+                    self.time_diffs_between_updates.append(now - self.last_event_time)
+                    logger.debug('Updating tracking of time since last update: %s' % self.time_diffs_between_updates)

-            last_event_index = last_event['maxPumpEventIndex']
-            last_event_time = now
-        else:
-            logger.info('No new reported t:connect data. (last event index: %s)' % last_event['maxPumpEventIndex'])
-            now = time.time()
+                # Mark the last event index uploaded from the pump and timestamp
+                self.last_event_index = last_event['maxPumpEventIndex']
+                self.last_event_time = now
+                self.last_attempt_time = now
+                self.time_diffs_between_attempts = []
+            else:
+                logger.info('No new reported t:connect data. (last event index: %s)' % last_event['maxPumpEventIndex'])

-            if last_event_time and (now - last_event_time) >= 60 * AUTOUPDATE_FAILURE_MINUTES:
-                logger.error(AutoupdateFailureException("No new data event indexes have been detected for over %d minutes. " % AUTOUPDATE_FAILURE_MINUTES +
-                             "The t:connect app might no longer be functioning."))
+                # If we haven't seen the pump event index update in AUTOUPDATE_NO_DATA_FAILURE_MINUTES,
+                # then trigger an error and potentially restart.
+                # The most likely case here is that the pump isn't uploading right now.
+                if self.last_event_time and (now - self.last_event_time) >= 60 * self.secret.AUTOUPDATE_NO_DATA_FAILURE_MINUTES:
+                    logger.error(AutoupdateNoEventIndexesDetectedError(
+                        "%s: No new data event indexes have been detected for %d minutes. " % (datetime.datetime.now(), (now - self.last_event_time)//60) +
+                        "The t:connect app might no longer be functioning."))

-                if AUTOUPDATE_RESTART_ON_FAILURE:
-                    sys.exit(1)
+                    # TODO: restarting doesn't really help anything here.
+                    # Should we notify the user?
+                    if self.secret.AUTOUPDATE_RESTART_ON_FAILURE:
+                        logger.error("Exiting with error code due to AUTOUPDATE_RESTART_ON_FAILURE")
+                        return 1

-            elif last_process_time_range and (now - last_process_time_range) >= 60 * AUTOUPDATE_FAILURE_MINUTES:
-                logger.error(AutoupdateFailureException("No new data has been found via the API for over %d minutes. " % AUTOUPDATE_FAILURE_MINUTES +
-                             "tconnectsync might not be functioning properly."))
+                # Similarly, if we HAVE seen pump event indexes update but have not successfully
+                # found any associated data updates from the tconnect API for AUTOUPDATE_NO_DATA_FAILURE_MINUTES,
+                # trigger an error and potentially restart. This could either be a tconnectsync problem,
+                # where we can see the indexes increasing, but it takes us until a period of no index
+                # update to reach our AUTOUPDATE_FAILURE_MINUTES threshold; or, a side effect of the
+                # above no indexes warning.
+                elif self.last_successful_process_time_range and (now - self.last_successful_process_time_range) >= 60 * self.secret.AUTOUPDATE_FAILURE_MINUTES:
+                    logger.error(AutoupdateNoNewDataDetectedError(
+                        "%s: No new data has been detected via the API for %d minutes. " % (datetime.datetime.now(), now - self.last_successful_process_time_range)//60 +
+                        "tconnectsync might not be functioning properly."))

-                if AUTOUPDATE_RESTART_ON_FAILURE:
-                    sys.exit(1)
+                    if self.secret.AUTOUPDATE_RESTART_ON_FAILURE:
+                        logger.error("%s: Exiting with error code due to AUTOUPDATE_RESTART_ON_FAILURE" % datetime.datetime.now())
+                        return 1
+
+                # Track how long we've been retrying
+                if self.last_attempt_time:
+                    self.time_diffs_between_attempts.append(now - self.last_attempt_time)
+
+                self.last_attempt_time = now
+
+                # If it's been 3 loops since the last time we found new data,
+                # then we're not in sync with the rate at which pump data is being
+                # uploaded, so 
+                if len(self.time_diffs_between_attempts) >= 3:
+                    # The pump hasn't sent us data that, based on previous cadence, we were expecting
+                    logger.warning(AutoupdateNoIndexChangeWarning("Sleeping %d seconds after unexpected no index change based on previous cadence. (New data might be delayed.)" % 
+                        int(self.secret.AUTOUPDATE_UNEXPECTED_NO_INDEX_SLEEP_SECONDS)))
+                    
+                    logger.debug("Last event time: %s, time diffs between attempts: %s" % (self.last_event_time, self.time_diffs_between_attempts))
+
+                    time.sleep(self.secret.AUTOUPDATE_UNEXPECTED_NO_INDEX_SLEEP_SECONDS)
+
+                    # Since we bail early, update the invocations count and potentially exit after sleeping.
+                    self.autoupdate_invocations += 1
+                    if self.secret.AUTOUPDATE_MAX_LOOP_INVOCATIONS > 0 and self.autoupdate_invocations >= self.secret.AUTOUPDATE_MAX_LOOP_INVOCATIONS:
+                        return 0
+
+                    continue
+
+            sleep_secs = self.secret.AUTOUPDATE_DEFAULT_SLEEP_SECONDS
+
+            # Sleep for a rolling average of time between updates
+            if self.secret.AUTOUPDATE_USE_FIXED_SLEEP != 1:
+                logger.debug("Time diffs between updates: %s" % self.time_diffs_between_updates)
+
+                # Only keep the 10 latest time diffs
+                if len(self.time_diffs_between_updates) > 10:
+                    self.time_diffs_between_updates = self.time_diffs_between_updates[1:]
+
+                # If we have less than 3 data points, 
+                if len(self.time_diffs_between_updates) > 2:
+                    sleep_secs = sum(self.time_diffs_between_updates) / len(self.time_diffs_between_updates)
+
+                # At minimum, update every AUTOUPDATE_MAX_SLEEP_SECONDS regardless
+                # of how often we're seeing new data appear
+                if sleep_secs > self.secret.AUTOUPDATE_MAX_SLEEP_SECONDS:
+                    sleep_secs = self.secret.AUTOUPDATE_MAX_SLEEP_SECONDS
+
+            logger.info('Sleeping for %0.01f sec' % sleep_secs)
+            time.sleep(sleep_secs)
+
+            self.autoupdate_invocations += 1
+            if self.secret.AUTOUPDATE_MAX_LOOP_INVOCATIONS > 0 and self.autoupdate_invocations >= self.secret.AUTOUPDATE_MAX_LOOP_INVOCATIONS:
+                return 0


-            if len(time_diffs) > 2:
-                logger.info('Sleeping 60 seconds after unexpected no index change. (New data might be delayed.)')
-                time.sleep(60)
-                continue
+class AutoupdateError(RuntimeError):
+    def __str__(self):
+        return "%s: %s" % (self.__class__.__name__, super().__str__())

-        sleep_secs = AUTOUPDATE_DEFAULT_SLEEP_SECONDS
-        if AUTOUPDATE_USE_FIXED_SLEEP != 1:
-            if len(time_diffs) > 10:
-                time_diffs = time_diffs[1:]
+class AutoupdateWarning(RuntimeWarning):
+    def __str__(self):
+        return "%s: %s" % (self.__class__.__name__, super().__str__())
+class AutoupdateFailureError(AutoupdateError):
+    pass

-            if len(time_diffs) > 2:
-                sleep_secs = sum(time_diffs) / len(time_diffs)
+class AutoupdateFailureWarning(AutoupdateWarning):
+    pass

-            if sleep_secs > AUTOUPDATE_MAX_SLEEP_SECONDS:
-                sleep_secs = AUTOUPDATE_MAX_SLEEP_SECONDS
+class AutoupdateNoEventIndexesDetectedError(AutoupdateError):
+    pass

-        # Sleep for a rolling average of time between updates
-        logger.info('Sleeping for %d sec' % sleep_secs)
-        time.sleep(sleep_secs)
+class AutoupdateNoNewDataDetectedError(AutoupdateError):
+    pass

-class AutoupdateFailureException(RuntimeError):
-    pass
+class AutoupdateNoIndexChangeWarning(AutoupdateWarning):
+    pass
@@ -1,58 +1,225 @@
+import sys
+import time
+import arrow
+import logging
+import pkg_resources
+from datetime import datetime
+from pprint import pformat
+
 from .nightscout import NightscoutApi
+from .parser.nightscout import BASAL_EVENTTYPE, BOLUS_EVENTTYPE
+from .parser.tconnect import TConnectEntry
+from .sync.basal import process_ciq_basal_events
+
+try:
+    __version__ = pkg_resources.require("tconnectsync")[0].version
+except Exception:
+    __version__ = "UNKNOWN"

 """
 Attempts to authenticate with each t:connect API,
 and returns the output of a sample API call from each.
 Also attempts to connect to the Nightscout API.
 """
-def check_login(tconnect, time_start, time_end):
+def check_login(tconnect, time_start, time_end, verbose=False, sanitize=True):
    errors = 0

-    print("Logging in to t:connect ControlIQ API...")
+    loglines = []
+    def log(*args):
+        print(*args)
+        loglines.append(" ".join([str(i) for i in args]) + "\n")
+
+    def debug(*args):
+        if verbose:
+            print(*args)
+        loglines.append(" ".join([str(i) for i in args]) + "\n")
+
+    log("tconnectsync version %s" % __version__)
+    log("Python version %s" % sys.version)
+    log("System platform %s" % sys.platform)
+    log("Running checks with time range %s to %s" % (time_start, time_end))
+    log("Current time: %s" % datetime.now())
+    log("time.tzname: %s" % str(time.tzname))
+
+    log("Loading secrets...")
+    try:
+        from .secret import TCONNECT_EMAIL, TCONNECT_PASSWORD, PUMP_SERIAL_NUMBER, NS_URL, NS_SECRET, TIMEZONE_NAME
+    except ImportError as e:
+        log("Error: Unable to load config file. Please check your .env file or environment variables")
+        log(e)
+    
+    if not TCONNECT_EMAIL or TCONNECT_EMAIL == 'email@email.com':
+        log("Error: You have not specified a TCONNECT_EMAIL")
+        errors += 1
+    
+    if not TCONNECT_PASSWORD or TCONNECT_PASSWORD == 'password':
+        log("Error: You have not specified a TCONNECT_PASSWORD")
+        errors += 1
+    
+    if not PUMP_SERIAL_NUMBER or PUMP_SERIAL_NUMBER == '11111111':
+        log("Error: You have not specified a PUMP_SERIAL_NUMBER")
+        errors += 1
+    
+    if not NS_URL or NS_URL == 'https://yournightscouturl/':
+        log("Error: You have not specified a NS_URL")
+        errors += 1
+    
+    if not NS_SECRET or NS_SECRET == 'apisecret':
+        log("Error: You have not specified a NS_SECRET")
+        errors += 1
+
+    log("TIMEZONE_NAME: %s" % TIMEZONE_NAME)
+
+    log("-----")
+
+    log("Logging in to t:connect ControlIQ API...")
    try:
        summary = tconnect.controliq.dashboard_summary(time_start, time_end)
-        print("ControlIQ dashboard summary: %s" % summary)
+        debug("ControlIQ dashboard summary: \n%s" % pformat(summary))
+        log("tconnect_software_ver: %s" % tconnect.controliq.tconnect_software_ver)
    except Exception as e:
-        print("Error occurred querying ControlIQ API: %s" % e)
+        log("Error occurred querying ControlIQ API for dashboard_summary:")
+        log(e)
        errors += 1
+    
+    log("Querying ControlIQ therapy_timeline...")
+    lastBasalTime = None
+    lastBasalDuration = None
+    try:
+        tt = tconnect.controliq.therapy_timeline(time_start, time_end)
+        debug("ControlIQ therapy_timeline: \n%s" % pformat(tt))
+        if tt:
+            processed_tt = process_ciq_basal_events(tt)
+            debug("ControlIQ processed therapy_timeline: \n%s" % pformat(processed_tt))
+            if processed_tt:
+                log("Last ControlIQ processed therapy_timeline event: \n%s" % pformat(processed_tt[-1]))
+                lastBasalTime = processed_tt[-1]['time']
+                lastBasalDuration = processed_tt[-1]['duration_mins']
+    except Exception as e:
+        log("Error occurred querying ControlIQ therapy_timeline:")
+        log(e)
+        errors += 1
+    
+    log("Querying ControlIQ therapy_events...")
+    try:
+        androidevents = tconnect.controliq.therapy_events(time_start, time_end)
+        debug("controliq therapy_events: \n%s" % pformat(androidevents))
+    except Exception as e:
+        log("Error occurred querying ControlIQ therapy_events:")
+        log(e)
+        errors += 1
+    
+    log("-----")

-    print("\nLogging in to t:connect WS2 API...")
+    log("Initializing t:connect WS2 API...")
+    ws2_loggedin = False
    try:
        summary = tconnect.ws2.basaliqtech(time_start, time_end)
-        print("WS2 basaliq status: %s" % summary)
+        debug("WS2 basaliq status: \n%s" % pformat(summary))
+        ws2_loggedin = True
    except Exception as e:
-        print("Error occurred querying WS2 API: %s" % e)
+        log("Error occurred querying WS2 API. This is okay so long as you are not using the PUMP_EVENTS or IOB sync features.")
+        log(e)
        errors += 1
+    
+    lastReadingTime = None
+    if ws2_loggedin:
+        log("Querying WS2 therapy_timeline_csv...")
+        try:
+            ttcsv = tconnect.ws2.therapy_timeline_csv(time_start, time_end)
+            debug("therapy_timeline_csv: \n%s" % pformat(ttcsv))
+            if ttcsv and "readingData" in ttcsv and len(ttcsv["readingData"]) > 0:
+                log("Last therapy_timeline_csv reading: \n%s" % pformat(ttcsv["readingData"][-1]))
+                lastReadingTime = TConnectEntry._datetime_parse(ttcsv["readingData"][-1]['EventDateTime'])
+        except Exception as e:
+            log("Error occurred querying WS2 therapy_timeline_csv. This is okay so long as you are not using the PUMP_EVENTS or IOB sync features.")
+            log(e)
+            errors += 1
+    else:
+        log("Not able to log in to WS2 API, so skipping therapy_timeline_csv")
+    
+    log("-----")

-    print("\nLogging in to t:connect Android API...")
+    log("Logging in to t:connect Android API...")
+    summary = None
    try:
        summary = tconnect.android.user_profile()
-        print("Android user profile: %s" % summary)
-
-        from .secret import PUMP_SERIAL_NUMBER
+        debug("Android user profile: \n%s" % pformat(summary))

        event = tconnect.android.last_event_uploaded(PUMP_SERIAL_NUMBER)
-        print("\nAndroid last uploaded event: %s" % event)
-    except ImportError:
-        print("Error: Unable to load config file.")
+        debug("Android last uploaded event: \n%s" % pformat(event))
    except Exception as e:
-        print("Error occurred querying Android API: %s" % e)
+        log("Error occurred querying Android API:")
+        log(e)
        errors += 1
+    
+    log("-----")

-    print("\nLogging in to Nightscout...")
+    log("Logging in to Nightscout...")
    try:
-        from .secret import NS_URL, NS_SECRET
+        nightscout = NightscoutApi(NS_URL, NS_SECRET)
+        status = nightscout.api_status()
+        debug("Nightscout status: \n%s" % pformat(status))

-        status = NightscoutApi(NS_URL, NS_SECRET).api_status()
-        print("\nNightscout status: %s" % status)
-    except ImportError:
-        print("Error: Unable to load config file.")
+        last_upload_basal = nightscout.last_uploaded_entry(BASAL_EVENTTYPE)
+        debug("Nightscout last uploaded basal: \n%s" % pformat(last_upload_basal))
+
+        last_upload_bolus = nightscout.last_uploaded_entry(BOLUS_EVENTTYPE)
+        debug("Nightscout last uploaded bolus: \n%s" % pformat(last_upload_bolus))
    except Exception as e:
-        print("Error occurred querying Nightscout API: %s" % e)
+        log("Error occurred querying Nightscout API:")
+        log(e)
        errors += 1

+    log("-----")
+
+    def time_ago(t):
+        return '%s ago' % (arrow.now() - arrow.get(t)) if t else 'n/a'
+
+    log("Last basal start time: %s (%s)" % (lastBasalTime, time_ago(lastBasalTime)))
+    log("Last basal duration: %s" % lastBasalDuration)
+    log("Last reading time: %s (%s)" % (lastReadingTime, time_ago(lastReadingTime)))
+
+    log("-----")
+
    if errors == 0:
-        print("\nNo API errors returned!")
+        log("No API errors returned!")
    else:
-        print("\nAPI errors occurred. Please check the errors above.")
+        log("API errors occurred. Please check the errors above.")
+    

+    with open('tconnectsync-check-output.log', 'w') as f:
+
+        if sanitize:
+            sanitizedData = {
+                'TCONNECT_EMAIL': TCONNECT_EMAIL,
+                'TCONNECT_PASSWORD': TCONNECT_PASSWORD,
+                'PUMP_SERIAL_NUMBER': PUMP_SERIAL_NUMBER,
+                'NS_URL': NS_URL,
+                'NS_SECRET': NS_SECRET
+            }
+
+            if summary:
+                sanitizedData.update({
+                    'ANDROID_PROFILE_USERID': summary.get('userID'),
+                    'ANDROID_PROFILE_PATIENT_FULLNAME': summary.get('patientFullName'),
+                    'ANDROID_PROFILE_CAREGIVER_FULLNAME': summary.get('caregiverFullName')
+                })
+
+            loglines = [run_sanitize(i, sanitizedData) for i in loglines]
+
+        f.writelines(loglines)
+
+    print("Created file tconnectsync-check-output.log containing additional debugging information.")
+    print("For support, you can upload this file to https://github.com/jwoglom/tconnectsync/issues/new")
+    if sanitize:
+        print("The file -- but NOT the output printed above -- has been sanitized to remove sensitive data.")
+    print("Please verify and remove any sensitive data, such as your Nightscout URL/secret and pump serial number,")
+    print("as necessary.")
+
+def run_sanitize(s, sanitizedData):
+    ret = str(s)
+    for k, v in sanitizedData.items():
+        if v and len(str(v)) > 0:
+            ret = ret.replace(str(v), '[%s]' % k)
+    return ret
@@ -0,0 +1,25 @@
+from dataclasses import dataclass, asdict
+
+
+@dataclass
+class Bolus:
+    description: str
+    complete: str # "1" / "0"
+    completion: str
+    request_time: str # _datetime_parse timestamp
+    completion_time: str # _datetime_parse timestamp
+    insulin: str
+    requested_insulin: str
+    carbs: str
+    bg: str # potentially ""
+    user_override: str
+    extended_bolus: str # "1" / "0"
+    bolex_completion_time: str
+    bolex_start_time: str
+
+    def to_dict(self):
+        return asdict(self)
+    
+    @property
+    def is_extended_bolus(self):
+        return self.extended_bolus == "1"
@@ -0,0 +1,27 @@
+from dataclasses import dataclass
+from typing import List, Optional
+
+@dataclass
+class Device:
+    name: str
+    model_number: str
+    status: str
+    guid: Optional[str]
+
+@dataclass
+class ProfileSegment:
+    display_time: str # Identical to time except written out as Midnight or Noon
+    time: str
+    basal_rate: float # _ u/hr
+    correction_factor: int # 1u: _ mg/dL
+    carb_ratio: float # 1u: _ g
+    target_bg_mgdl: int
+
+@dataclass
+class Profile:
+    title: str
+    active: bool
+    segments: List[ProfileSegment]
+    calculated_total_daily_basal: float # in units
+    insulin_duration_min: int
+    carbs_enabled: bool
@@ -0,0 +1,480 @@
+import arrow
+
+from tconnectsync.domain.bolus import Bolus
+
+from ..secret import TIMEZONE_NAME
+
+
+def _datetime_parse(date):
+    # consistent format with ws2 endpoint
+    return arrow.get(date, tzinfo=TIMEZONE_NAME).format("YYYY-MM-DD HH:mm:ssZZ")
+
+class TherapyEvent:
+    type = None
+    eventDateTime = None
+    sourceRecId = None
+
+    def parse(self, json):
+        self.type = json['type']
+        self.eventDateTime = json['eventDateTime']
+        self.sourceRecId = json['sourceRecId']
+        self.rawJson = json
+
+class CGMTherapyEvent(TherapyEvent):
+    eventID = None
+    egv = None
+    """
+    {
+        "eventDateTime": "2022-07-21T00:00:08",
+        "eventID": 256,
+        "requestDateTime": "0001-01-01T00:00:00",
+        "type": "CGM",
+        "description": "EGV",
+        "sourceRecId": 0,
+        "eventTypeId": 0,
+        "deviceType": "t:slim X2 Insulin Pump",
+        "serialNumber": "xxx",
+        "indexId": 0,
+        "uploadId": 0,
+        "interactive": 0,
+        "tempRateId": 0,
+        "tempRateCompleted": 0,
+        "tempRateActivated": 0,
+        "egv": {
+            "estimatedGlucoseValue": 174,
+            "hypo": 0,
+            "belowTarget": 0,
+            "withinTarget": 1,
+            "aboveTarget": 0,
+            "hyper": 0
+        }
+    },
+    """
+    @classmethod
+    def parse(_, json):
+        self = CGMTherapyEvent()
+        TherapyEvent.parse(self, json)
+        self.eventID = json['eventID']
+        self.egv = json['egv']['estimatedGlucoseValue']
+        return self
+
+class BGTherapyEvent(TherapyEvent):
+    eventID = None
+    egv = None
+    """
+    {   
+        'bg': 160, # note in EGV
+        'cgmCalibration': 1, # not in EGV
+        'description': 'BG',
+        'deviceType': 't:slim X2 Insulin Pump',
+        'eventDateTime': '2022-08-20T07:25:24',
+        'eventTypeId': 16,
+        'indexId': 844955,
+        'interactive': 0,
+        'iob': 0.75,
+        'note': {   'active': False,
+                'eventId': 0, # different location than EGV
+                'eventTypeId': 16,
+                'id': 0,
+                'indexId': '',
+                'sourceRecordId': 0},
+        'requestDateTime': '0001-01-01T00:00:00',
+        'serialNumber': 'xxx',
+        'sourceRecId': 793549667,
+        'tempRateActivated': 0,
+        'tempRateCompleted': 0,
+        'tempRateId': 0,
+        'type': 'BG',
+        'uploadId': 748700213}
+    """    
+    @classmethod
+    def parse(_, json):
+        self = BGTherapyEvent()
+        TherapyEvent.parse(self, json)
+        self.eventID = json['note']['eventId']
+        # This is probably not how we want to provide CGM calibrations to Nightscout,
+        # but will just include it as egv data for now to keep the thing from crashing :)
+        self.egv = json['bg']
+        return self
+
+class BolusTherapyEvent(TherapyEvent):
+    bolusRequestOptions = None
+    REQUEST_AUTOMATIC = "Automatic Bolus/Correction"
+    REQUEST_STANDARD = "Standard"
+
+    bolusType = None
+    TYPE_AUTOMATIC = "Automatic Correction"
+    TYPE_CARB = "Carb"
+
+    carbSize = None
+    correctionBolusSize = None
+    foodBolusSize = None
+    
+    insulinDelivered = None
+    insulinRequested = None
+    completionDateTime = None
+
+    completionStatus = None
+    STATUS_COMPLETED = "Completed"
+
+    eventHistoryReportDetails = None
+
+    standardPercent = None
+    sourceRecId = None
+
+    @classmethod
+    def parse(_, json):
+        self = BolusTherapyEvent()
+        TherapyEvent.parse(self, json)
+        self.description = json.get("description")
+        self.complete = json.get("standard", {}).get("bolusIsComplete")
+        self.completion = json.get("standard", {}).get("completionStatusDesc")
+        self.request_time = json.get("requestDateTime")
+        self.completion_time = json.get("standard", {}).get("insulinDelivered", {}).get("completionDateTime")
+        # TODO: separate extended vs standard bolus into separate fields
+        self.insulin = json.get("standard", {}).get("insulinDelivered", {}).get("value")
+        self.requested_insulin = json.get("standard", {}).get("insulinRequested")
+        self.carbs = json.get("carbSize")
+        self.bg = json.get("bg")
+        self.user_override = json.get("userOverride")
+        self.extended_bolus = json.get("bolusRequestOptions") == "Extended"
+        if self.extended_bolus and self.complete:
+            # TODO(https://github.com/jwoglom/tconnectsync/issues/19): read more extended bolus info
+            self.complete = json.get("bolex", {}).get("extendedBolusIsComplete")
+            self.completion = json.get("bolex", {}).get("completionStatusDesc")
+            self.bolex_completion_time = json.get("bolex", {}).get("insulinDelivered", {}).get("completionDateTime")
+            self.bolex_start_time = json.get("bolex", {}).get("bolexStartDateTime")
+        else:
+            self.bolex_completion_time = ""
+            self.bolex_start_time = ""
+        return self
+    
+    def to_bolus(self):
+        return Bolus(
+            description=self.description,
+            complete="1" if self.complete else "0",
+            completion=self.completion or "",
+            request_time=_datetime_parse(self.request_time),
+            completion_time=_datetime_parse(self.completion_time),
+            insulin=str(self.insulin),
+            requested_insulin=str(self.requested_insulin),
+            carbs=str(self.carbs or "0"), # Nightscout expects non-empty carbs
+            bg=str(self.bg or ""),
+            user_override=str(self.user_override),
+            extended_bolus="1" if self.extended_bolus else "0",
+            bolex_completion_time=_datetime_parse(self.bolex_completion_time) if self.bolex_completion_time else "",
+            bolex_start_time=_datetime_parse(self.bolex_start_time) if self.bolex_start_time else ""
+        )
+
+    """
+    Correction:
+    {
+        "actualTotalBolusRequested": 2.9,
+        "bg": 254,
+        "bolusRequestOptions": "Automatic Bolus/Correction",
+        "bolusType": "Automatic Correction",
+        "carbSize": 0,
+        "correctionBolusSize": 2.9,
+        "correctionFactor": 30,
+        "declinedCorrection": 0,
+        "duration": 0,
+        "eventDateTime": "2022-07-21T11:53:08",
+        "eventHistoryReportDetails": "CF 1:30 - Carb Ratio 1:0 - Target BG 110",
+        "eventHistoryReportEventDesc": "Correction Bolus",
+        "foodBolusSize": 0,
+        "isQuickBolus": 0,
+        "note": {
+            "id": 0,
+            "indexId": "572946",
+            "eventTypeId": 64,
+            "sourceRecordId": 0,
+            "eventId": 0,
+            "active": false
+        },
+        "requestDateTime": "2022-07-21T11:53:08",
+        "standard": {
+            "insulinDelivered": {
+                "completionDateTime": "2022-07-21T11:55:24",
+                "value": 2.9
+            },
+            "foodDelivered": 0,
+            "correctionDelivered": 2.9,
+            "insulinRequested": 2.9,
+            "completionStatusId": 3,
+            "completionStatusDesc": "Completed",
+            "bolusIsComplete": 1,
+            "bolusRequestId": 3361,
+            "bolusCompletionId": 3361
+        },
+        "standardPercent": 100,
+        "targetBG": 110,
+        "userOverride": 0,
+        "type": "Bolus",
+        "description": "Automatic Bolus/Correction",
+        "sourceRecId": 1171791787,
+        "eventTypeId": 0,
+        "indexId": 0,
+        "uploadId": 0,
+        "interactive": 0,
+        "tempRateId": 0,
+        "tempRateCompleted": 0,
+        "tempRateActivated": 0
+    },
+    Standard:
+    {
+        "actualTotalBolusRequested": 4.17,
+        "bolusRequestOptions": "Standard",
+        "bolusType": "Carb",
+        "carbSize": 25,
+        "correctionBolusSize": 0,
+        "correctionFactor": 30,
+        "declinedCorrection": 0,
+        "duration": 0,
+        "eventDateTime": "2022-07-21T12:27:36",
+        "eventHistoryReportDetails": "CF 1:30 - Carb Ratio 1:6 - Target BG 110",
+        "eventHistoryReportEventDesc": "Food Bolus",
+        "foodBolusSize": 4.17,
+        "iob": 2.62,
+        "isQuickBolus": 0,
+        "note": {
+            "id": 0,
+            "indexId": "573042",
+            "eventTypeId": 64,
+            "sourceRecordId": 0,
+            "eventId": 0,
+            "active": false
+        },
+        "requestDateTime": "2022-07-21T12:27:36",
+        "standard": {
+            "insulinDelivered": {
+                "completionDateTime": "2022-07-21T12:29:21",
+                "value": 4.17
+            },
+            "foodDelivered": 4.17,
+            "correctionDelivered": 0,
+            "insulinRequested": 4.17,
+            "completionStatusId": 3,
+            "completionStatusDesc": "Completed",
+            "bolusIsComplete": 1,
+            "bolusRequestId": 3362,
+            "bolusCompletionId": 3362
+        },
+        "standardPercent": 100,
+        "targetBG": 110,
+        "userOverride": 0,
+        "type": "Bolus",
+        "description": "Standard",
+        "sourceRecId": 1171853319,
+        "eventTypeId": 0,
+        "indexId": 0,
+        "uploadId": 0,
+        "interactive": 0,
+        "tempRateId": 0,
+        "tempRateCompleted": 0,
+        "tempRateActivated": 0
+    },
+    Extended bolus incomplete:
+    {
+        "actualTotalBolusRequested": 0.4,
+        "bg": 131,
+        "bolex": {
+            "size": 0.2,
+            "bolexStartDateTime": "2022-08-09T23:20:04",
+            "iob": 0,
+            "completionStatusId": 0,
+            "extendedBolusIsComplete": 0,
+            "insulinRequested": 0,
+            "bolexCompletionId": 0
+        },
+        "bolusRequestOptions": "Extended",
+        "bolusType": "Carb",
+        "carbSize": 0,
+        "correctionBolusSize": 0.0,
+        "correctionFactor": 30.0,
+        "declinedCorrection": 0,
+        "duration": 15,
+        "eventDateTime": "2022-08-09T23:19:15",
+        "eventHistoryReportDetails": "CF 1:30 - Carb Ratio 1:6 - Target BG 110<br/>Override: Pump calculated Bolus = 0.0 units",
+        "eventHistoryReportEventDesc": "Food Bolus: 50&#37; Extended 15 mins",
+        "foodBolusSize": 0.0,
+        "iob": 5.87,
+        "isQuickBolus": 0,
+        "note": {
+            "id": 0,
+            "indexId": "631597",
+            "eventTypeId": 64,
+            "sourceRecordId": 0,
+            "eventId": 0,
+            "active": false
+        },
+        "requestDateTime": "2022-08-09T23:19:15",
+        "standard": {
+            "insulinDelivered": {
+                "completionDateTime": "2022-08-09T23:20:04",
+                "value": 0.2
+            },
+            "foodDelivered": 0.0,
+            "correctionDelivered": 0.0,
+            "insulinRequested": 0.2,
+            "completionStatusId": 3,
+            "completionStatusDesc": "Completed",
+            "bolusIsComplete": 1,
+            "bolusRequestId": 3636.0,
+            "bolusCompletionId": 3636.0
+        },
+        "standardPercent": 50.0,
+        "targetBG": 110,
+        "userOverride": 1,
+        "type": "Bolus",
+        "description": "Extended 50.00%/0.00",
+        "sourceRecId": 1209631944,
+        "eventTypeId": 0,
+        "indexId": 0,
+        "uploadId": 0,
+        "interactive": 0,
+        "tempRateId": 0,
+        "tempRateCompleted": 0,
+        "tempRateActivated": 0
+    }
+    Extended bolus (complete):
+    {
+        "actualTotalBolusRequested": 0.4,
+        "bg": 131,
+        "bolex": {
+            "size": 0.2,
+            "bolexStartDateTime": "2022-08-09T23:20:04",
+            "insulinDelivered": {
+                "completionDateTime": "2022-08-09T23:35:03",
+                "value": 0.2
+            },
+            "iob": 5.7,
+            "completionStatusId": 3.0,
+            "completionStatusDesc": "Completed",
+            "extendedBolusIsComplete": 1,
+            "insulinRequested": 0.2,
+            "bolexCompletionId": 16757133
+        },
+        "bolusRequestOptions": "Extended",
+        "bolusType": "Carb",
+        "carbSize": 0,
+        "correctionBolusSize": 0.0,
+        "correctionFactor": 30.0,
+        "declinedCorrection": 0,
+        "duration": 15,
+        "eventDateTime": "2022-08-09T23:19:15",
+        "eventHistoryReportDetails": "CF 1:30 - Carb Ratio 1:6 - Target BG 110<br/>Override: Pump calculated Bolus = 0.0 units",
+        "eventHistoryReportEventDesc": "Food Bolus: 50&#37; Extended 15 mins",
+        "foodBolusSize": 0.0,
+        "iob": 5.87,
+        "isQuickBolus": 0,
+        "note": {
+            "id": 0,
+            "indexId": "631597",
+            "eventTypeId": 64,
+            "sourceRecordId": 0,
+            "eventId": 0,
+            "active": false
+        },
+        "requestDateTime": "2022-08-09T23:19:15",
+        "standard": {
+            "insulinDelivered": {
+                "completionDateTime": "2022-08-09T23:20:04",
+                "value": 0.2
+            },
+            "foodDelivered": 0.0,
+            "correctionDelivered": 0.0,
+            "insulinRequested": 0.2,
+            "completionStatusId": 3,
+            "completionStatusDesc": "Completed",
+            "bolusIsComplete": 1,
+            "bolusRequestId": 3636.0,
+            "bolusCompletionId": 3636.0
+        },
+        "standardPercent": 50.0,
+        "targetBG": 110,
+        "userOverride": 1,
+        "type": "Bolus",
+        "description": "Extended 50.00%/0.00",
+        "sourceRecId": 1209631944,
+        "eventTypeId": 0,
+        "indexId": 0,
+        "uploadId": 0,
+        "interactive": 0,
+        "tempRateId": 0,
+        "tempRateCompleted": 0,
+        "tempRateActivated": 0
+    }
+    CGM Calibration (Therapy Event Type BG):
+    {   'bg': 160,
+        'cgmCalibration': 1,
+        'description': 'BG',
+        'deviceType': 't:slim X2 Insulin Pump',
+        'eventDateTime': '2022-08-20T07:25:24',
+        'eventTypeId': 16,
+        'indexId': 844955,
+        'interactive': 0,
+        'iob': 0.75,
+        'note': {   'active': False,
+                    'eventId': 0,
+                    'eventTypeId': 16,
+                    'id': 0,
+                    'indexId': '',
+                    'sourceRecordId': 0},
+        'requestDateTime': '0001-01-01T00:00:00',
+        'serialNumber': 'xxx',
+        'sourceRecId': 793549667,
+        'tempRateActivated': 0,
+        'tempRateCompleted': 0,
+        'tempRateId': 0,
+        'type': 'BG',
+        'uploadId': 0}
+    """
+
+class BasalTherapyEvent(TherapyEvent):
+    """
+    {
+        'basalRate': {
+            'duration': 0, 
+            'percent': 0, 
+            'value': 0.0
+        }, 
+        'displayInHistory': 0, 
+        'eventDateTime': '2022-12-02T00:00:00', 
+        'note': {
+            'id': 0, 
+            'indexId': '16403', 
+            'eventTypeId': 90, 
+            'sourceRecordId': 0, 
+            'eventId': 0, 
+            'active': False
+        }, 
+        'noteDate': {}, 
+        'requestDateTime': '0001-01-01T00:00:00', 
+        'type': 'Basal', 
+        'description': 'NDE', 
+        'sourceRecId': xxx, 
+        'eventTypeId': 0, 
+        'indexId': 0, 
+        'uploadId': 0, 
+        'interactive': 1, 
+        'tempRateId': 0, 
+        'tempRateCompleted': 0, 
+        'tempRateActivated': 0
+    }
+    """
+    basalRateValue = None
+    basalRatePercent = None
+    basalRateDuration = None
+    eventTime = None
+
+
+    @classmethod
+    def parse(_, json):
+        self = CGMTherapyEvent()
+        TherapyEvent.parse(self, json)
+        if 'basalRate' in json:
+            self.basalRateValue = json['basalRate']['value']
+            self.basalRatePercent = json['basalRate']['percent']
+            self.basalRateDuration = json['basalRate']['duration']
+        self.eventTime = json['eventDateTime']
+        return self
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+
+class Time:
+    def __init__(self, hour: int, min: int):
+        self.hour = hour
+        self.min = min
+    
+    @classmethod
+    def parse(cls, input):
+        if ' ' not in input:
+            raise ValueError('unable to parse time: %s' % input)
+
+        hrmin, ampm = input.split(' ')
+        
+        hr, min = hrmin.split(':')
+        hr = int(hr)
+        min = int(min)
+
+        if ampm.lower() == 'pm':
+            hr += 12
+        elif ampm.lower() != 'am':
+            raise ValueError('unable to parse time: %s' % input)
+        
+        return cls(hr, min)
@@ -6,17 +6,18 @@ BOLUS = "BOLUS"
 IOB = "IOB"
 BOLUS_BG = "BOLUS_BG"
 CGM = "CGM"
+PUMP_EVENTS = "PUMP_EVENTS"

 DEFAULT_FEATURES = [
    BASAL,
-    BOLUS,
-    IOB
+    BOLUS
 ]

 ALL_FEATURES = [
    BASAL,
    BOLUS,
-    IOB
+    IOB,
+    PUMP_EVENTS
 ]


@@ -1,24 +1,39 @@
-import sys
+import datetime
 import requests
 import hashlib
 import time
 import urllib.parse
+import arrow
+import logging

 from urllib.parse import urljoin

 from .api.common import ApiException
 from .parser.nightscout import ENTERED_BY

-# try:
-#     from .secret import NS_URL, NS_SECRET
-# except Exception:
-#     print('Unable to import Nightscout secrets from secret.py')
-#     sys.exit(1)
+def format_datetime(date):
+	return arrow.get(date).isoformat()

+def time_range(field_name, start_time, end_time, t_to_space=False):
+	def fmt(date):
+		ret = format_datetime(date)
+		if t_to_space:
+			return ret.replace('T', ' ')
+		return ret
+	arg = ''
+	if start_time:
+		arg += '&find[%s][$gte]=%s' % (field_name, fmt(start_time))
+	if end_time:
+		arg += '&find[%s][$lte]=%s' % (field_name, fmt(end_time))
+	return arg
+
+
+logger = logging.getLogger(__name__)
 class NightscoutApi:
-	def __init__(self, url, secret):
+	def __init__(self, url, secret, skip_verify=False):
 		self.url = url
 		self.secret = secret
+		self.verify = False if skip_verify else None


 	def upload_entry(self, ns_format, entity='treatments'):
@@ -26,7 +41,7 @@ class NightscoutApi:
 			'Accept': 'application/json',
 			'Content-Type': 'application/json',
 			'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
-		})
+		}, verify=self.verify)
 		if r.status_code != 200:
 			raise ApiException(r.status_code, "Nightscout upload response: %s" % r.text)

@@ -35,7 +50,7 @@ class NightscoutApi:
 			'Accept': 'application/json',
 			'Content-Type': 'application/json',
 			'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
-		})
+		}, verify=self.verify)
 		if r.status_code != 200:
 			raise ApiException(r.status_code, "Nightscout delete response: %s" % r.text)

@@ -44,45 +59,72 @@ class NightscoutApi:
 			'Accept': 'application/json',
 			'Content-Type': 'application/json',
 			'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
-		})
+		}, verify=self.verify)
 		if r.status_code != 200:
 			raise ApiException(r.status_code, "Nightscout put response: %s" % r.text)

-	def last_uploaded_entry(self, eventType):
-		latest = requests.get(urljoin(self.url, 'api/v1/treatments?count=1&find[enteredBy]=' + urllib.parse.quote(ENTERED_BY) + '&find[eventType]=' + urllib.parse.quote(eventType) + '&ts=' + str(time.time())), headers={
-			'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
-		})
-		if latest.status_code != 200:
-			raise ApiException(latest.status_code, "Nightscout last_uploaded_entry response: %s" % latest.text)
+	def last_uploaded_entry(self, eventType, time_start=None, time_end=None):
+		def internal(t_to_space):
+			dateFilter = time_range('created_at', time_start, time_end, t_to_space=t_to_space)
+			latest = requests.get(urljoin(self.url, 'api/v1/treatments?count=1&find[enteredBy]=' + urllib.parse.quote(ENTERED_BY) + '&find[eventType]=' + urllib.parse.quote(eventType) + dateFilter + '&ts=' + str(time.time())), headers={
+				'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
+			}, verify=self.verify)
+			if latest.status_code != 200:
+				raise ApiException(latest.status_code, "Nightscout last_uploaded_entry response: %s" % latest.text)

-		j = latest.json()
-		if j and len(j) > 0:
-			return j[0]
-		return None
+			j = latest.json()
+			if j and len(j) > 0:
+				return j[0]
+			return None
+		
+		ret = internal(False)
+		if ret is None and (time_start or time_end):
+			ret = internal(True)
+			if ret is not None:
+				logger.warning("last_uploaded_entry with eventType=%s time_start=%s time_end=%s only returned data when timestamps contained a space" % (eventType, time_start, time_end))
+		return ret
 	
-	def last_uploaded_bg_entry(self):
-		latest = requests.get(urljoin(self.url, 'api/v1/entries.json?count=1&find[device]=' + urllib.parse.quote(ENTERED_BY) + '&ts=' + str(time.time())), headers={
-			'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
-		})
-		if latest.status_code != 200:
-			raise ApiException(latest.status_code, "Nightscout last_uploaded_bg_entry response: %s" % latest.text)
+	def last_uploaded_bg_entry(self, time_start=None, time_end=None):
+		def internal(t_to_space):
+			dateFilter = time_range('dateString', time_start, time_end, t_to_space=t_to_space)
+			latest = requests.get(urljoin(self.url, 'api/v1/entries.json?count=1&find[device]=' + urllib.parse.quote(ENTERED_BY) + dateFilter + '&ts=' + str(time.time())), headers={
+				'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
+			}, verify=self.verify)
+			if latest.status_code != 200:
+				raise ApiException(latest.status_code, "Nightscout last_uploaded_bg_entry response: %s" % latest.text)

-		j = latest.json()
-		if j and len(j) > 0:
-			return j[0]
-		return None
+			j = latest.json()
+			if j and len(j) > 0:
+				return j[0]
+			return None
+		
+		ret = internal(False)
+		if ret is None and (time_start or time_end):
+			ret = internal(True)
+			if ret is not None:
+				logger.warning("last_uploaded_bg_entry with time_start=%s time_end=%s only returned data when timestamps contained a space" % (time_start, time_end))
+		return ret

-	def last_uploaded_activity(self, activityType):
-		latest = requests.get(urljoin(self.url, 'api/v1/activity?find[enteredBy]=' + urllib.parse.quote(ENTERED_BY) + '&find[activityType]=' + urllib.parse.quote(activityType) + '&ts=' + str(time.time())), headers={
-			'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
-		})
-		if latest.status_code != 200:
-			raise ApiException(latest.status_code, "Nightscout activity response: %s" % latest.text)
+	def last_uploaded_activity(self, activityType, time_start=None, time_end=None):
+		def internal(t_to_space):
+			dateFilter = time_range('created_at', time_start, time_end, t_to_space=t_to_space)
+			latest = requests.get(urljoin(self.url, 'api/v1/activity?find[enteredBy]=' + urllib.parse.quote(ENTERED_BY) + '&find[activityType]=' + urllib.parse.quote(activityType) + dateFilter + '&ts=' + str(time.time())), headers={
+				'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
+			}, verify=self.verify)
+			if latest.status_code != 200:
+				raise ApiException(latest.status_code, "Nightscout activity response: %s" % latest.text)

-		j = latest.json()
-		if j and len(j) > 0:
-			return j[0]
-		return None
+			j = latest.json()
+			if j and len(j) > 0:
+				return j[0]
+			return None
+		
+		ret = internal(False)
+		if ret is None and (time_start or time_end):
+			ret = internal(True)
+			if ret is not None:
+				logger.warning("last_uploaded_activity with activityType=%s time_start=%s time_end=%s only returned data when timestamps contained a space" % (activityType, time_start, time_end))
+		return ret

 	"""
 	Returns general status information about the Nightscout server.
@@ -90,7 +132,7 @@ class NightscoutApi:
 	def api_status(self):
 		status = requests.get(urljoin(self.url, 'api/v1/status.json'), headers={
 			'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
-		})
+		}, verify=self.verify)
 		if status.status_code != 200:
 			raise Exception('HTTP error status code (%d) from Nightscout: %s' % (status.status_code, status.text))
 		return status.json()
@@ -0,0 +1,27 @@
+from tconnectsync.domain.therapy_event import BolusTherapyEvent, CGMTherapyEvent, BGTherapyEvent, BasalTherapyEvent
+from tconnectsync.parser.tconnect import TConnectEntry
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+def split_therapy_events(ciqTherapyEvents):
+    bolusEvents = []
+    cgmEvents = []
+    bgEvents = []
+    basalEvents = []
+    for e in ciqTherapyEvents['event']:
+        event = TConnectEntry.parse_therapy_event(e)
+        if isinstance(event, BolusTherapyEvent):
+            bolusEvents.append(event)
+        elif isinstance(event, CGMTherapyEvent): 
+            cgmEvents.append(event)
+        elif isinstance(event, BGTherapyEvent):
+            bgEvents.append(event)
+        elif isinstance(event, BasalTherapyEvent):
+            basalEvents.append(event)
+
+        
+    logger.debug("split_therapy_events: %d bolus, %d CGM, %d BG, %d basal" % (len(bolusEvents), len(cgmEvents), len(bgEvents), len(basalEvents)))
+    # TODO: BG events (CGM Calibration) values are not currently returned from ciq_therapy_events.py
+    return bolusEvents, cgmEvents
@@ -1,8 +1,15 @@
 import arrow

 ENTERED_BY = "Pump (tconnectsync)"
+
 BASAL_EVENTTYPE = "Temp Basal"
 BOLUS_EVENTTYPE = "Combo Bolus"
+SITECHANGE_EVENTTYPE = "Site Change"
+BASALSUSPENSION_EVENTTYPE = "Basal Suspension"
+ACTIVITY_EVENTTYPE = "Activity"
+EXERCISE_EVENTTYPE = "Exercise"
+SLEEP_EVENTTYPE = "Sleep"
+
 IOB_ACTIVITYTYPE = "tconnect_iob"


@@ -41,7 +48,7 @@ class NightscoutEntry:
        }
        if bg:
            if bg_type not in (NightscoutEntry.SENSOR, NightscoutEntry.FINGER):
-                raise InvalidBolusTypeException
+                raise InvalidBolusTypeException("bg_type: %s (%s)" % (bg_type, data))

            data.update({
                "glucose": str(bg),
@@ -69,5 +76,36 @@ class NightscoutEntry:
            # delta, direction are undefined
        }

+    @staticmethod
+    def sitechange(created_at, reason=""):
+        return {
+            "eventType": SITECHANGE_EVENTTYPE,
+            "reason": reason,
+            "notes": reason,
+            "created_at": created_at,
+            "enteredBy": ENTERED_BY
+        }
+
+    @staticmethod
+    def basalsuspension(created_at, reason=""):
+        return {
+            "eventType": BASALSUSPENSION_EVENTTYPE,
+            "reason": reason,
+            "notes": reason,
+            "created_at": created_at,
+            "enteredBy": ENTERED_BY
+        }
+
+    @staticmethod
+    def activity(created_at, duration, reason="", event_type=ACTIVITY_EVENTTYPE):
+        return {
+            "eventType": event_type,
+            "reason": reason,
+            "notes": reason,
+            "duration": float(duration),
+            "created_at": created_at,
+            "enteredBy": ENTERED_BY
+        }
+
 class InvalidBolusTypeException(RuntimeError):
    pass
@@ -1,5 +1,9 @@
+from os import stat
 import sys
 import arrow
+from tconnectsync.domain.bolus import Bolus
+
+from tconnectsync.domain.therapy_event import BolusTherapyEvent, CGMTherapyEvent, BGTherapyEvent, BasalTherapyEvent

 try:
    from ..secret import TIMEZONE_NAME
@@ -13,7 +17,6 @@ a more digestable format, which is used internally.
 """
 class TConnectEntry:
    BASAL_EVENTS = { 0: "Suspension", 1: "Profile", 2: "TempRate", 3: "Algorithm" }
-    ACTIVITY_EVENTS = { 1: "Sleep", 2: "Exercise", 3: "AutoBolus", 4: "CarbOnly" }

    @staticmethod
    def _epoch_parse(x):
@@ -27,6 +30,10 @@ class TConnectEntry:
        # is overwritten with America/New_York, resulting in 2020-09-01T06:00:00-04:00, the
        # correct timestamp.
        return arrow.get(x, tzinfo="America/Los_Angeles").replace(tzinfo=TIMEZONE_NAME)
+    
+    @staticmethod
+    def _jsonp_epoch_parse(x):
+        return TConnectEntry._epoch_parse(int(x.replace('/Date(', '').replace('-0000)/', '')))

    @staticmethod
    def parse_ciq_basal_entry(data, delivery_type=""):
@@ -101,7 +108,7 @@ class TConnectEntry:
        complete = is_complete(data["ExtendedBolusIsComplete"]) or is_complete(data["BolusIsComplete"])
        extended_bolus = ("extended" in data["Description"].lower())

-        return {
+        return Bolus(**{
            "description": data["Description"],
            "complete": "1" if complete else "",
            "completion": data["CompletionStatusDesc"] if not extended_bolus else data["BolexCompletionStatusDesc"],
@@ -113,9 +120,10 @@ class TConnectEntry:
            "bg": data["BG"], # Note: can be empty string for automatic Control-IQ boluses
            "user_override": data["UserOverride"],
            "extended_bolus": "1" if extended_bolus else "",
-            "bolex_completion_time": TConnectEntry._datetime_parse(data["BolexCompletionDateTime"]).format() if complete and extended_bolus else None,
-            "bolex_start_time": TConnectEntry._datetime_parse(data["BolexStartDateTime"]).format() if complete and extended_bolus else None,
-        }
+            # Note: completion time can be empty if the extended bolus is in progress
+            "bolex_completion_time": TConnectEntry._datetime_parse(data["BolexCompletionDateTime"]).format() if data["BolexCompletionDateTime"] and complete and extended_bolus else None,
+            "bolex_start_time": TConnectEntry._datetime_parse(data["BolexStartDateTime"]).format() if data["BolexStartDateTime"] and complete and extended_bolus else None,
+        })
    
    @staticmethod
    def parse_reading_entry(data):
@@ -123,4 +131,91 @@ class TConnectEntry:
            "time": TConnectEntry._datetime_parse(data["EventDateTime"]).format(),
            "bg": data["Readings (CGM / BGM)"],
            "type": data["Description"]
-        }
+        }
+
+    ACTIVITY_EVENTS = { 1: "Sleep", 2: "Exercise", 3: "AutoBolus", 4: "CarbOnly" }
+
+    @staticmethod
+    def parse_ciq_activity_event(data):
+        if data["eventType"] not in TConnectEntry.ACTIVITY_EVENTS.keys():
+            raise UnknownCIQActivityEventException(data)
+
+        time = TConnectEntry._epoch_parse(data["x"])
+        return {
+            "time": time.format(),
+            "duration_mins": data["duration"] / 60,
+            "event_type": TConnectEntry.ACTIVITY_EVENTS[data["eventType"]]
+        }
+    
+    BASALSUSPENSION_EVENTS = {
+        # site-cart corresponds to a Site or Cartridge change,
+        # specifically a Tubing Filled: Norm AND a Cannula Filled: Norm alert.
+        # (This means that a typical changing of a cartridge and then a site
+        # will result in two consecutive events of this type.)
+        "site-cart": "Site/Cartridge Change",
+
+        # alarm corresponds to one of the following:
+        # - an Empty Cartridge alarm
+        # - a Pump shutdown
+        "alarm": "Empty Cartridge/Pump Shutdown",
+
+        # manual corresponds to a Pumping Suspended by User event
+        "manual": "User Suspended",
+
+        # temp-profile corresponds to a Basal Rate Change event to 0u/hr
+        "temp-profile": "Basal Rate Change"
+    }
+
+    BASALSUSPENSION_SKIPPED_EVENTS = {
+        # basal-profile events are not very useful; with ControlIQ enabled,
+        # Tandem does not show them in the tconnect UI.
+        "basal-profile",
+
+        # If an event continues to occur after the date switches over to the next
+        # day, then the pump generates a "previous" event. This isn't useful to
+        # us, so we skip them.
+        "previous",
+    }
+    @staticmethod
+    def parse_basalsuspension_event(data):
+        if not data or "SuspendReason" not in data:
+            return None
+
+        if data["SuspendReason"] in TConnectEntry.BASALSUSPENSION_SKIPPED_EVENTS:
+            return None
+
+        if data["SuspendReason"] not in TConnectEntry.BASALSUSPENSION_EVENTS.keys():
+            raise UnknownBasalSuspensionEventException(data)
+
+        time = TConnectEntry._jsonp_epoch_parse(data["EventDateTime"])
+        return {
+            "time": time.format(),
+            "event_type": TConnectEntry.BASALSUSPENSION_EVENTS[data["SuspendReason"]]
+        }
+    
+    # Parses an entry from controliq.therapy_events() and returns a TherapyEvent
+    @staticmethod
+    def parse_therapy_event(data):
+        if data["type"] == "Bolus":
+            return BolusTherapyEvent.parse(data)
+        elif data["type"] == "CGM":
+            return CGMTherapyEvent.parse(data)
+        elif data["type"] == "BG":
+            return BGTherapyEvent.parse(data)
+        elif data["type"] == "Basal":
+            return BasalTherapyEvent.parse(data)
+        
+        raise UnknownTherapyEventException(data)
+
+class UnknownCIQActivityEventException(Exception):
+    def __init__(self, data):
+        super().__init__("Unknown CIQ activity event type: %s" % data)
+
+class UnknownBasalSuspensionEventException(Exception):
+    def __init__(self, data):
+        super().__init__("Unknown basal suspension event type: %s" % data)
+
+class UnknownTherapyEventException(Exception):
+    def __init__(self, data):
+        typ = data["type"]
+        super().__init__(f"Unknown therapy event type: {typ} in {data}")
@@ -3,6 +3,8 @@ import datetime
 import arrow
 import time

+from tconnectsync.parser.ciq_therapy_events import split_therapy_events
+
 from .util import timeago
 from .api.common import ApiException
 from .sync.basal import (
@@ -22,8 +24,14 @@ from .sync.cgm import (
    process_cgm_events,
    ns_write_cgm_events
 )
+from .sync.pump_events import (
+    process_ciq_activity_events,
+    process_basalsuspension_events,
+    ns_write_pump_events
+)
 from .parser.tconnect import TConnectEntry
-from .features import BASAL, BOLUS, IOB, BOLUS_BG, CGM, DEFAULT_FEATURES
+from .features import BASAL, BOLUS, IOB, BOLUS_BG, CGM, DEFAULT_FEATURES, PUMP_EVENTS
+from tconnectsync.sync import basal

 logger = logging.getLogger(__name__)

@@ -45,33 +53,80 @@ def process_time_range(tconnect, nightscout, time_start, time_end, pretend, feat
            ciqTherapyTimelineData = None
        else:
            raise e
+    
+    csvReadingData = None
+    csvIobData = None
+    csvBasalData = None
+    csvBolusData = None

-    logger.info("Downloading t:connect CSV data")
-    csvdata = tconnect.ws2.therapy_timeline_csv(time_start, time_end)
+    ciqBolusData = None
+    ciqReadingData = None
+    if BOLUS in features:
+        logger.info("Downloading t:connect therapy_events")
+        ciqTherapyEventsData = tconnect.controliq.therapy_events(time_start, time_end)
+        ciqBolusData, ciqReadingData = split_therapy_events(ciqTherapyEventsData)

-    readingData = csvdata["readingData"]
-    iobData = csvdata["iobData"]
-    csvBasalData = csvdata["basalData"]
-    bolusData = csvdata["bolusData"]
+        if ciqReadingData and len(ciqReadingData) > 0:
+            lastReading = ciqReadingData[-1].eventDateTime
+            lastReading = TConnectEntry._datetime_parse(lastReading)
+            logger.debug(ciqReadingData[-1])
+            logger.info("Last CGM reading from t:connect CIQ: %s (%s)" % (lastReading, timeago(lastReading)))
+        else:
+            logger.warning("No last CGM reading is able to be determined from CIQ")
+        
+        if ciqBolusData and len(ciqBolusData) > 0:
+            lastBolus = ciqBolusData[-1].eventDateTime
+            lastReading = TConnectEntry._datetime_parse(lastBolus)
+            logger.debug(ciqBolusData[-1].to_bolus())
+            logger.info("Last bolus from t:connect CIQ: %s (%s)" % (lastBolus, timeago(lastBolus)))
+
+    bolusFallingBack = (BOLUS in features and not ciqBolusData)
+    ciqFallingBack = (CGM in features and not ciqReadingData)
+    if bolusFallingBack or \
+       ciqFallingBack or \
+       BOLUS_BG in features or \
+       IOB in features:
+        logger.warning("Downloading t:connect CSV data")
+        if bolusFallingBack:
+            logger.warning("Falling back on WS2 CSV data source because BOLUS is an enabled feature and CIQ bolus data was empty!!")
+        if ciqFallingBack:
+            logger.warning("Falling back on WS2 CSV data source because CGM is an enabled feature and CIQ cgm data was empty!!")
+        if BOLUS_BG in features:
+            logger.warning("Falling back on WS2 CSV data source because BOLUS_BG is an enabled feature. " +
+                        "Please consider disabling this feature to improve synchronization reliability.")
+        if IOB in features:
+            logger.warning("Falling back on WS2 CSV data source because IOB is an enabled feature. " +
+                        "Please consider disabling this feature to improve synchronization reliability.")
+        
+        logger.warning("<!!> The WS2 data source is unreliable and may prevent timely synchronization")
+        csvdata = tconnect.ws2.therapy_timeline_csv(time_start, time_end)
+
+        csvReadingData = csvdata["readingData"]
+        csvIobData = csvdata["iobData"]
+        csvBasalData = csvdata["basalData"]
+        csvBolusData = csvdata["bolusData"]
+
+        if csvReadingData and len(csvReadingData) > 0:
+            lastReading = csvReadingData[-1]['EventDateTime'] if 'EventDateTime' in csvReadingData[-1] else 0
+            lastReading = TConnectEntry._datetime_parse(lastReading)
+            logger.debug(csvReadingData[-1])
+            logger.info("Last CGM reading from t:connect CSV: %s (%s)" % (lastReading, timeago(lastReading)))
+        else:
+            logger.warning("No last CGM reading is able to be determined from CSV")

-    if readingData and len(readingData) > 0:
-        lastReading = readingData[-1]['EventDateTime'] if 'EventDateTime' in readingData[-1] else 0
-        lastReading = TConnectEntry._datetime_parse(lastReading)
-        logger.debug(readingData[-1])
-        logger.info("Last CGM reading from t:connect: %s (%s)" % (lastReading, timeago(lastReading)))
-    else:
-        logger.warning("No last CGM reading is able to be determined")

    added = 0

-    cgmData = None
-    if CGM in features or BOLUS_BG in features:
-        logger.debug("Processing CGM events")
-        cgmData = process_cgm_events(readingData)
-    
-    if CGM in features:
-        logger.debug("Writing CGM events")
-        added += ns_write_cgm_events(nightscout, cgmData, pretend)
+    if csvReadingData:
+        cgmData = None
+        if CGM in features or BOLUS_BG in features:
+            logger.debug("Processing CGM events")
+            cgmData = process_cgm_events(csvReadingData)
+        
+        if CGM in features:
+            logger.debug("Writing CGM events")
+            added += ns_write_cgm_events(nightscout, cgmData, pretend, time_start=time_start, time_end=time_end)
+            logger.debug("Finished writing CGM events")

    if BASAL in features:
        basalEvents = process_ciq_basal_events(ciqTherapyTimelineData)
@@ -80,16 +135,53 @@ def process_time_range(tconnect, nightscout, time_start, time_end, pretend, feat
            add_csv_basal_events(basalEvents, csvBasalData)
        else:
            logger.debug("No CSV basal data found")
+        
+        if basalEvents and len(basalEvents) > 0:
+            logger.info("Last basal event from CIQ: %s" % basalEvents[-1])

-        added += ns_write_basal_events(nightscout, basalEvents, pretend=pretend)
+        logger.debug("Writing basal events")
+        added += ns_write_basal_events(nightscout, basalEvents, pretend=pretend, time_start=time_start, time_end=time_end)
+        logger.debug("Finished writing basal events")
+    
+    if PUMP_EVENTS in features:
+        pumpEvents = process_ciq_activity_events(ciqTherapyTimelineData)
+        logger.debug("CIQ activity events: %s" % pumpEvents)
+
+        logger.warning("Using WS2 data source for basalsuspension because PUMP_EVENTS is an enabled feature")
+        logger.warning("<!!> The WS2 data source is unreliable and may prevent timely synchronization")
+        ws2BasalSuspension = tconnect.ws2.basalsuspension(time_start, time_end)
+
+        bsPumpEvents = process_basalsuspension_events(ws2BasalSuspension)
+        logger.debug("basalsuspension events: %s" % bsPumpEvents)
+
+        pumpEvents += bsPumpEvents
+
+        logger.debug("Writing pump events")
+        added += ns_write_pump_events(nightscout, pumpEvents, pretend=pretend, time_start=time_start, time_end=time_end)
+        logger.debug("Finished writing basal events")

    if BOLUS in features:
-        bolusEvents = process_bolus_events(bolusData)
-        added += ns_write_bolus_events(nightscout, bolusEvents, pretend=pretend, include_bg=(BOLUS_BG in features))
+        bolusEvents = []
+        if ciqBolusData:
+            logger.info("Processing ciqBolusData (%d entries)" % len(ciqBolusData))
+            bolusEvents = process_bolus_events(ciqBolusData, source="ciq")

-    if IOB in features:
-        iobEvents = process_iob_events(iobData)
-        added += ns_write_iob_events(nightscout, iobEvents, pretend=pretend)
+        if csvBolusData and not bolusEvents:
+            logger.warning("Falling back on non-CIQ csvBolusData")
+            bolusEvents = process_bolus_events(csvBolusData, source="csv")
+            logger.debug("ciq bolusEvents: %s" % bolusEvents)
+        
+        logger.info("finalized bolusEvents: %s" % bolusEvents)
+        logger.debug("Writing bolus events")
+        added += ns_write_bolus_events(nightscout, bolusEvents, pretend=pretend, include_bg=(BOLUS_BG in features), time_start=time_start, time_end=time_end)
+        logger.debug("Finished writing bolus events")
+
+    if csvIobData:
+        if IOB in features:
+            iobEvents = process_iob_events(csvIobData)
+            logger.debug("Writing iob events")
+            added += ns_write_iob_events(nightscout, iobEvents, pretend=pretend)
+            logger.debug("Finished writing iob events")

    logger.info("Wrote %d events to Nightscout this process cycle" % added)
-    return added
+    return added
@@ -1,15 +1,25 @@
-import os, sys
-from dotenv import load_dotenv
+import os, sys, pathlib
+from dotenv import dotenv_values

-load_dotenv()
+cwd_path = os.path.join(os.getcwd(), '.env')
+global_path = os.path.join(pathlib.Path.home(), '.config/tconnectsync/.env')

-def get(*args):
-    return os.environ.get(*args)
+values = {}
+
+if os.path.exists(cwd_path):
+    values = dotenv_values(cwd_path)
+elif os.path.exists(global_path):
+    values = dotenv_values(global_path)
+else:
+    values = dotenv_values()
+
+def get(val, default=None):
+    return os.environ.get(val, values.get(val, default))

 def get_number(name, default):
    val = get(name, default)
    try:
-        return int(val)
+        return float(val)
    except ValueError:
        print("Error: %s must be a number." % name)
        print("Current value: %s" % val)
@@ -21,22 +31,37 @@ def get_bool(name, default):
 TCONNECT_EMAIL = get('TCONNECT_EMAIL', 'email@email.com')
 TCONNECT_PASSWORD = get('TCONNECT_PASSWORD', 'password')

-PUMP_SERIAL_NUMBER = get_number('PUMP_SERIAL_NUMBER', '11111111')
+PUMP_SERIAL_NUMBER = int(get_number('PUMP_SERIAL_NUMBER', '11111111'))

 NS_URL = get('NS_URL', 'https://yournightscouturl/')
 NS_SECRET = get('NS_SECRET', 'apisecret')

+if not get('NS_SECRET') and get('API_SECRET'):
+    print('API_SECRET environment variable is set, overriding NS_SECRET')
+    NS_SECRET = get('API_SECRET')
+
+NS_SKIP_TLS_VERIFY = get_bool('NS_SKIP_TLS_VERIFY', 'false')
+
 TIMEZONE_NAME = get('TIMEZONE_NAME', 'America/New_York')

+if not get('TIMEZONE_NAME') and get('TZ'):
+    print('TZ environment variable is set, overriding TIMEZONE_NAME')
+    TIMEZONE_NAME = get('TZ')
+
 # Optional configuration

 AUTOUPDATE_DEFAULT_SLEEP_SECONDS = get_number('AUTOUPDATE_DEFAULT_SLEEP_SECONDS', '300') # 5 minutes
 AUTOUPDATE_MAX_SLEEP_SECONDS = get_number('AUTOUPDATE_MAX_SLEEP_SECONDS', '1500') # 25 minutes
+AUTOUPDATE_UNEXPECTED_NO_INDEX_SLEEP_SECONDS = get_number('AUTOUPDATE_UNEXPECTED_NO_INDEX_SLEEP_SECONDS', '60') # 1 minute
 AUTOUPDATE_USE_FIXED_SLEEP = get_bool('AUTOUPDATE_USE_FIXED_SLEEP', 'false')
-AUTOUPDATE_FAILURE_MINUTES = get_number('AUTOUPDATE_FAILURE_MINUTES', '180') # 3 hours
-AUTOUPDATE_RESTART_ON_FAILURE = get_bool('AUTOUPDATE_RESTART_ON_FAILURE', 'false')
+AUTOUPDATE_NO_DATA_FAILURE_MINUTES = get_number('AUTOUPDATE_NO_DATA_FAILURE_MINUTES', '180') # 3 hours
+AUTOUPDATE_FAILURE_MINUTES = get_number('AUTOUPDATE_FAILURE_MINUTES', '15') # 15 minutes
+AUTOUPDATE_RESTART_ON_FAILURE = get_bool('AUTOUPDATE_RESTART_ON_FAILURE', 'true')
+AUTOUPDATE_MAX_LOOP_INVOCATIONS = get_number('AUTOUPDATE_MAX_LOOP_INVOCATIONS', '-1')

 ENABLE_TESTING_MODES = get_bool('ENABLE_TESTING_MODES', 'false')
+SKIP_NS_LAST_UPLOADED_CHECK = get_bool('SKIP_NS_LAST_UPLOADED_CHECK', 'false')
+REQUESTS_PROXY = get('REQUESTS_PROXY', '')

 if __name__ == '__main__':
    for k in locals():
@@ -6,6 +6,7 @@ from ..parser.nightscout import (
    NightscoutEntry
 )
 from ..parser.tconnect import TConnectEntry
+from ..secret import SKIP_NS_LAST_UPLOADED_CHECK

 logger = logging.getLogger(__name__)

@@ -68,7 +69,7 @@ def process_ciq_basal_events(data):
            seconds = (existingTime - unprocessedTime).seconds

            newEvent = TConnectEntry.manual_suspension_to_basal_entry(suspension, seconds)
-            logger.debug("Creating basal event for unprocessed suspension: %s" % newEvent)
+            logger.debug("Adding basal event for unprocessed suspension: %s" % newEvent)
            newEvents.append(newEvent)

    # Any remaining suspensions which have not been processed have not ended,
@@ -103,19 +104,24 @@ def add_csv_basal_events(basalEvents, data):
 """
 Given processed basal data, adds basal events to Nightscout.
 """
-def ns_write_basal_events(nightscout, basalEvents, pretend=False):
+def ns_write_basal_events(nightscout, basalEvents, pretend=False, time_start=None, time_end=None):
    logger.debug("ns_write_basal_events: querying for last uploaded entry")
-    last_upload = nightscout.last_uploaded_entry(BASAL_EVENTTYPE)
+    last_upload = nightscout.last_uploaded_entry(BASAL_EVENTTYPE, time_start=time_start, time_end=time_end)
    last_upload_time = None
    if last_upload:
        last_upload_time = arrow.get(last_upload["created_at"])
    logger.info("Last Nightscout basal upload: %s" % last_upload_time)

+    if SKIP_NS_LAST_UPLOADED_CHECK:
+        logger.warning("Overriding last upload check")
+        last_upload = None
+        last_upload_time = None
+
    add_count = 0
    for event in basalEvents:
        if last_upload_time and arrow.get(event["time"]) < last_upload_time:
            if pretend:
-                logger.info("Skipping basal event before last upload time: %s" % event)
+                logger.info("Skipping basal event before last upload time: %s (time range: %s - %s)" % (event, time_start, time_end))
            continue

        recent_needs_update = False
@@ -1,5 +1,6 @@
 import arrow
 import logging
+from tconnectsync.domain.bolus import Bolus

 from tconnectsync.sync.cgm import find_event_at

@@ -8,32 +9,39 @@ from ..parser.nightscout import (
    NightscoutEntry
 )
 from ..parser.tconnect import TConnectEntry
+from ..secret import SKIP_NS_LAST_UPLOADED_CHECK

 logger = logging.getLogger(__name__)

 """
 Given bolus data input from the therapy timeline CSV, converts it into a digestable format.
 """
-def process_bolus_events(bolusdata, cgmEvents=None):
+def process_bolus_events(bolusdata, cgmEvents=None, source=""):
    bolusEvents = []

    for b in bolusdata:
-        parsed = TConnectEntry.parse_bolus_entry(b)
-        if parsed["completion"] != "Completed":
-            if parsed["insulin"] and float(parsed["insulin"]) > 0:
+        parsed = None
+        if source == "ciq":
+            parsed = b.to_bolus()
+        else:
+            parsed = TConnectEntry.parse_bolus_entry(b)
+        
+        assert type(parsed) == Bolus
+        if parsed.completion != "Completed":
+            if parsed.insulin and float(parsed.insulin) > 0:
                # Count non-completed bolus if any insulin was delivered (vs. the amount of insulin requested)
-                parsed["description"] += " (%s: requested %s units)" % (parsed["completion"], parsed["requested_insulin"])
+                parsed.description += " (%s: requested %s units)" % (parsed.completion, parsed.requested_insulin)
            else:
-                logger.warning("Skipping non-completed bolus data (was a bolus in progress?): %s parsed: %s" % (b, parsed))
+                logger.warning("Skipping non-completed %s bolus data (was a bolus in progress?): %s parsed: %s" % (source, b, parsed))
                continue

-        if parsed["bg"] and cgmEvents:
-            requested_at = parsed["request_time"] if not parsed["extended_bolus"] else parsed["bolex_start_time"]
-            parsed["bg_type"] = guess_bolus_bg_type(parsed["bg"], requested_at, cgmEvents)
+        if parsed.bg and cgmEvents:
+            requested_at = parsed.request_time if not parsed.extended_bolus else parsed.bolex_start_time
+            parsed.bg_type = guess_bolus_bg_type(parsed.bg, requested_at, cgmEvents)

        bolusEvents.append(parsed)

-    bolusEvents.sort(key=lambda event: arrow.get(event["request_time"] if not event["extended_bolus"] else event["bolex_start_time"]))
+    bolusEvents.sort(key=lambda event: arrow.get(event.request_time if not event.is_extended_bolus else event.bolex_start_time))

    return bolusEvents

@@ -56,37 +64,42 @@ def guess_bolus_bg_type(bg, created_at, cgmEvents):
 """
 Given processed bolus data, adds bolus events to Nightscout.
 """
-def ns_write_bolus_events(nightscout, bolusEvents, pretend=False, include_bg=False, reading_events=None):
+def ns_write_bolus_events(nightscout, bolusEvents, pretend=False, include_bg=False, reading_events=None, time_start=None, time_end=None):
    logger.debug("ns_write_bolus_events: querying for last uploaded entry")
-    last_upload = nightscout.last_uploaded_entry(BOLUS_EVENTTYPE)
+    last_upload = nightscout.last_uploaded_entry(BOLUS_EVENTTYPE, time_start=time_start, time_end=time_end)
    last_upload_time = None
    if last_upload:
        last_upload_time = arrow.get(last_upload["created_at"])
    logger.info("Last Nightscout bolus upload: %s" % last_upload_time)

+    if SKIP_NS_LAST_UPLOADED_CHECK:
+        logger.warning("Overriding last upload check")
+        last_upload = None
+        last_upload_time = None
+
    add_count = 0
    for event in bolusEvents:
-        created_at = event["completion_time"] if not event["extended_bolus"] else event["bolex_start_time"]
+        created_at = event.completion_time if not event.is_extended_bolus else event.bolex_start_time
        if last_upload_time and arrow.get(created_at) <= last_upload_time:
            if pretend:
-                logger.info("Skipping basal event before last upload time: %s" % event)
+                logger.info("Skipping basal event before last upload time: %s (time range: %s - %s)" % (event, time_start, time_end))
            continue

-        if include_bg and event["bg"]:
+        if include_bg and event.bg:
            entry = NightscoutEntry.bolus(
-                bolus=event["insulin"],
-                carbs=event["carbs"],
+                bolus=event.insulin,
+                carbs=event.carbs,
                created_at=created_at,
-                notes="{}{}{}".format(event["description"], " (Override)" if event["user_override"] == "1" else "", " (Extended)" if event["extended_bolus"] == "1" else ""),
-                bg=event["bg"],
-                bg_type=event["bg_type"]
+                notes="{}{}{}".format(event.description, " (Override)" if event.user_override == "1" else "", " (Extended)" if event.extended_bolus == "1" else ""),
+                bg=event.bg,
+                bg_type=event.bg_type
            )
        else:
            entry = NightscoutEntry.bolus(
-                bolus=event["insulin"],
-                carbs=event["carbs"],
+                bolus=event.insulin,
+                carbs=event.carbs,
                created_at=created_at,
-                notes="{}{}{}".format(event["description"], " (Override)" if event["user_override"] == "1" else "", " (Extended)" if event["extended_bolus"] == "1" else "")
+                notes="{}{}{}".format(event.description, " (Override)" if event.user_override == "1" else "", " (Extended)" if event.extended_bolus == "1" else "")
            )

        add_count += 1
@@ -39,9 +39,9 @@ def find_event_at(cgmEvents, find_time):
 """
 Given processed CGM data, adds reading entries to Nightscout.
 """
-def ns_write_cgm_events(nightscout, cgmEvents, pretend=False):
+def ns_write_cgm_events(nightscout, cgmEvents, pretend=False, time_start=None, time_end=None):
    logger.debug("ns_write_cgm_events: querying for last uploaded entry")
-    last_upload = nightscout.last_uploaded_bg_entry()
+    last_upload = nightscout.last_uploaded_bg_entry(time_start=time_start, time_end=time_end)
    last_upload_time = None
    if last_upload:
        last_upload_time = arrow.get(last_upload["dateString"])
@@ -52,7 +52,7 @@ def ns_write_cgm_events(nightscout, cgmEvents, pretend=False):
        created_at = event["time"]
        if last_upload_time and arrow.get(created_at) <= last_upload_time:
            if pretend:
-                logger.info("Skipping CGM event before last upload time: %s" % event)
+                logger.info("Skipping CGM event before last upload time: %s (time range: %s - %s)" % (event, time_start, time_end))
            continue

        entry = NightscoutEntry.entry(
@@ -24,9 +24,9 @@ def process_iob_events(iobdata):
 """
 Given processed IOB data, creates a single Nightscout activity definition to store IOB.
 """
-def ns_write_iob_events(nightscout, iobEvents, pretend=False):
+def ns_write_iob_events(nightscout, iobEvents, pretend=False, time_start=None, time_end=None):
    logger.debug("ns_write_iob_events: querying for last uploaded entry")
-    last_upload = nightscout.last_uploaded_activity(IOB_ACTIVITYTYPE)
+    last_upload = nightscout.last_uploaded_activity(IOB_ACTIVITYTYPE, time_start=time_start, time_end=time_end)
    last_upload_time = None
    if last_upload:
        last_upload_time = arrow.get(last_upload["created_at"])
@@ -0,0 +1,218 @@
+import arrow
+import logging
+
+from ..parser.nightscout import (
+    SITECHANGE_EVENTTYPE,
+    BASALSUSPENSION_EVENTTYPE,
+    EXERCISE_EVENTTYPE,
+    SLEEP_EVENTTYPE,
+    ACTIVITY_EVENTTYPE,
+    NightscoutEntry
+)
+from ..parser.tconnect import TConnectEntry
+from ..secret import SKIP_NS_LAST_UPLOADED_CHECK
+
+logger = logging.getLogger(__name__)
+
+"""
+Given a list of "activity events" from the CIQ therapy timeline endpoint,
+process it into our internal events format.
+
+These events contain a duration.
+"""
+def process_ciq_activity_events(data):
+    events = []
+
+    for event in data["events"]:
+        events.append(TConnectEntry.parse_ciq_activity_event(event))
+
+    return events
+
+"""
+Given a list of "basal suspension events" from the basalsuspension WS2 endpoint,
+process it into our internal events format.
+
+These events do NOT contain a duration.
+"""
+def process_basalsuspension_events(data):
+    events = []
+
+    for event in data['BasalSuspension']:
+        parsed = TConnectEntry.parse_basalsuspension_event(event)
+
+        if parsed:
+            events.append(parsed)
+    
+
+    return events
+
+"""
+Given processed pump event data (of various types), write them to Nightscout
+"""
+def ns_write_pump_events(nightscout, pumpEvents, pretend=False, time_start=None, time_end=None):
+    count = 0
+
+    siteChangeEvents = []
+    emptyCartEvents = []
+    userSuspendedEvents = []
+    exerciseEvents = []
+    sleepEvents = []
+    activityEvents = []
+
+    for event in pumpEvents:
+        if event["event_type"] == TConnectEntry.BASALSUSPENSION_EVENTS["site-cart"]:
+            siteChangeEvents.append(event)
+        elif event["event_type"] in TConnectEntry.BASALSUSPENSION_EVENTS["alarm"]:
+            emptyCartEvents.append(event)
+        elif event["event_type"] in TConnectEntry.BASALSUSPENSION_EVENTS["manual"]:
+            userSuspendedEvents.append(event)
+        elif event["event_type"] == "Exercise":
+            exerciseEvents.append(event)
+        elif event["event_type"] == "Sleep":
+            sleepEvents.append(event)
+        elif event["event_type"] in TConnectEntry.ACTIVITY_EVENTS.values():
+            activityEvents.append(event)
+            
+    logger.debug("siteChangeEvents: %s" % siteChangeEvents)
+    logger.debug("emptyCartEvents: %s" % emptyCartEvents)
+    logger.debug("userSuspendedEvents: %s" % userSuspendedEvents)
+    logger.debug("exerciseEvents: %s" % exerciseEvents)
+    logger.debug("sleepEvents: %s" % sleepEvents)
+    logger.debug("activityEvents: %s" % activityEvents)
+    
+    count += ns_write_pump_sitechange_events(nightscout, siteChangeEvents, pretend=pretend, time_start=time_start, time_end=time_end)
+    count += ns_write_empty_cart_events(nightscout, emptyCartEvents, pretend=pretend, time_start=time_start, time_end=time_end)
+    count += ns_write_user_suspended_events(nightscout, userSuspendedEvents, pretend=pretend, time_start=time_start, time_end=time_end)
+
+    count += ns_write_exercise_activity_events(nightscout, exerciseEvents, pretend=pretend, time_start=time_start, time_end=time_end)
+    count += ns_write_sleep_activity_events(nightscout, sleepEvents, pretend=pretend, time_start=time_start, time_end=time_end)
+    count += ns_write_activity_events(nightscout, activityEvents, pretend=pretend, time_start=time_start, time_end=time_end)
+
+    return count
+
+def ns_write_pump_sitechange_events(nightscout, siteChangeEvents, pretend=False, time_start=None, time_end=None):
+    return _ns_write_pump_events(
+        nightscout, 
+        siteChangeEvents, 
+        lambda event: NightscoutEntry.sitechange(
+            created_at=event["time"],
+            reason=event["event_type"]
+        ),
+        SITECHANGE_EVENTTYPE,
+        pretend=pretend,
+        time_start=time_start,
+        time_end=time_end)
+
+def ns_write_empty_cart_events(nightscout, emptyCartEvents, pretend=False, time_start=None, time_end=None):
+    return _ns_write_pump_events(
+        nightscout, 
+        emptyCartEvents, 
+        lambda event: NightscoutEntry.basalsuspension(
+            created_at=event["time"],
+            reason=event["event_type"]
+        ),
+        BASALSUSPENSION_EVENTTYPE,
+        pretend=pretend,
+        time_start=time_start,
+        time_end=time_end)
+
+def ns_write_user_suspended_events(nightscout, userSuspendedEvents, pretend=False, time_start=None, time_end=None):
+    return _ns_write_pump_events(
+        nightscout, 
+        userSuspendedEvents, 
+        lambda event: NightscoutEntry.basalsuspension(
+            created_at=event["time"],
+            reason=event["event_type"]
+        ),
+        BASALSUSPENSION_EVENTTYPE,
+        pretend=pretend,
+        time_start=time_start,
+        time_end=time_end)
+
+def ns_write_exercise_activity_events(nightscout, exerciseEvents, pretend=False, time_start=None, time_end=None):
+    return _ns_write_pump_events(
+        nightscout, 
+        exerciseEvents, 
+        lambda event: NightscoutEntry.activity(
+            created_at=event["time"],
+            reason=event["event_type"],
+            duration=event["duration_mins"],
+            event_type=EXERCISE_EVENTTYPE
+        ),
+        EXERCISE_EVENTTYPE,
+        pretend=pretend,
+        time_start=time_start,
+        time_end=time_end)
+
+def ns_write_sleep_activity_events(nightscout, sleepEvents, pretend=False, time_start=None, time_end=None):
+    return _ns_write_pump_events(
+        nightscout, 
+        sleepEvents, 
+        lambda event: NightscoutEntry.activity(
+            created_at=event["time"],
+            reason=event["event_type"],
+            duration=event["duration_mins"],
+            event_type=SLEEP_EVENTTYPE
+        ),
+        SLEEP_EVENTTYPE,
+        pretend=pretend,
+        time_start=time_start,
+        time_end=time_end)
+
+def ns_write_activity_events(nightscout, activityEvents, pretend=False, time_start=None, time_end=None):
+    return _ns_write_pump_events(
+        nightscout, 
+        activityEvents, 
+        lambda event: NightscoutEntry.activity(
+            created_at=event["time"],
+            reason=event["event_type"],
+            duration=event["duration_mins"]
+        ),
+        ACTIVITY_EVENTTYPE,
+        pretend=pretend,
+        time_start=time_start,
+        time_end=time_end)
+
+def _ns_write_pump_events(nightscout, events, buildNsEventFunc, eventType, pretend=False, time_start=None, time_end=None):
+    if len(events) == 0:
+        logger.debug("No %s events to process" % eventType)
+        return 0
+
+    logger.debug("ns_write_pump_events: querying for last %s" % eventType)
+    last_upload = nightscout.last_uploaded_entry(eventType, time_start=time_start, time_end=time_end)
+    last_upload_time = None
+    if last_upload:
+        last_upload_time = arrow.get(last_upload["created_at"])
+    logger.info("Last Nightscout %s: %s" % (eventType, last_upload_time))
+
+    if SKIP_NS_LAST_UPLOADED_CHECK:
+        logger.warning("Overriding last upload check")
+        last_upload = None
+        last_upload_time = None
+
+    add_count = 0
+    for event in events:
+        created_at = event["time"]
+        if last_upload_time and arrow.get(created_at) <= last_upload_time:
+            skip = True
+            if "duration_mins" in event.keys() and "duration" in last_upload.keys():
+                if created_at == last_upload["created_at"] and float(event["duration_mins"]) > float(last_upload["duration"]):
+                    logger.info("Latest %s event needs updating: duration has increased from %s to %s: %s" % (eventType, last_upload["duration"], event["duration_mins"], event))
+                    logger.info("Deleting previous %s: %s" % (eventType, last_upload))
+                    nightscout.delete_entry('treatments/%s' % last_upload["_id"])
+                    skip = False
+            
+            if skip:
+                if pretend:
+                    logger.info("Skipping %s pump event before last upload time: %s (time range: %s - %s)" % (eventType, event, time_start, time_end))
+                continue
+
+        entry = buildNsEventFunc(event)
+
+        add_count += 1
+
+        logger.info("  Processing %s: %s entry: %s" % (eventType, event, entry))
+        if not pretend:
+            nightscout.upload_entry(entry)
+
+    return add_count
@@ -1,5 +1,8 @@
 import arrow

+from . import cli
+from . import constants
+
 def timeago(timestamp):
    seconds = (arrow.get() - arrow.get(timestamp)).total_seconds()
    fmt = '%s ago' if seconds >= 0 else 'in %s'
@@ -15,3 +18,14 @@ def timeago(timestamp):
    ret += '%d minutes' % (seconds//60)

    return fmt % ret
+
+# String methods only available in python 3.9+
+def removesuffix(input_string, suffix):
+    if suffix and input_string.endswith(suffix):
+        return input_string[:-len(suffix)]
+    return input_string
+
+def removeprefix(input_string, prefix):
+    if prefix and input_string.startswith(prefix):
+        return input_string[len(prefix):]
+    return input_string
@@ -0,0 +1,20 @@
+import logging
+
+"""
+Enables logging at the specified level for all loggers
+inside the tconnectsync package, and sets up a basicConfig
+to print those log messages to stderr.
+"""
+def enable_logging(level=logging.DEBUG):
+    logging.basicConfig()
+    for logger in logging.root.manager.loggerDict:
+        if logger.startswith('tconnectsync'):
+            logging.getLogger(logger).setLevel(level)
+
+"""
+Returns a TConnectApi object with default secret parameters.
+"""
+def get_api():
+    from ..api import TConnectApi
+    from ..secret import TCONNECT_EMAIL, TCONNECT_PASSWORD
+    return TConnectApi(TCONNECT_EMAIL, TCONNECT_PASSWORD)
@@ -0,0 +1,4 @@
+
+# http://www.soc-bdr.org/rds/authors/unit_tables_conversions_and_genetic_dictionaries/conversion_glucose_mg_dl_to_mmol_l/index_en.html
+MMOLL_TO_MGDL = 18.0182
+MGDL_TO_MMOLL = 0.0555
@@ -0,0 +1,10 @@
+# Hack to enable debug-level logging when running tests
+# with `python3 -m unittest discover`
+
+import sys
+if 'unittest' in sys.modules:
+    import logging
+    logging.basicConfig(
+        level=logging.DEBUG,
+        format='%(asctime)s %(levelname)-8s %(message)s',
+        datefmt='%Y-%m-%d %H:%M:%S')
@@ -1,9 +1,11 @@
 import tconnectsync.api
+import requests

 class ControlIQApi(tconnectsync.api.controliq.ControlIQApi):
    def __init__(self):
        self.BASE_URL = 'invalid://'
        self.LOGIN_URL = 'invalid://'
+        self.session = requests.Session() # mocked in tests

    def login(self, email, password):
        raise NotImplementedError
@@ -19,7 +21,7 @@ class WS2Api(tconnectsync.api.ws2.WS2Api):
        self.BASE_URL = 'invalid://'
        self.SLEEP_SECONDS_INCREMENT = 0.01

-    def get(self, endpoint, query):
+    def get(self, endpoint):
        raise NotImplementedError

    def get_jsonp(self, endpoint):
@@ -38,9 +40,16 @@ class AndroidApi(tconnectsync.api.android.AndroidApi):
    def _get(self, endpoint, query={}, **kwargs):
        raise NotImplementedError

+class WebUIScraper(tconnectsync.api.webui.WebUIScraper):
+    def __init__(self, controliq):
+        self.controliq = controliq
+
 class TConnectApi(tconnectsync.api.TConnectApi):
-    def __init__(self):
-        pass
+    def __init__(self, email=None, password=None):
+        if email is not None and password is not None:
+            self.with_credentials = True
+        else:
+            self.with_credentials = False

    _ciq = ControlIQApi()
    _ws2 = WS2Api()
@@ -0,0 +1,44 @@
+import unittest
+
+from unittest.mock import patch
+
+from tconnectsync.api.common import base_session
+
+class TestRequestsProxy(unittest.TestCase):
+    def test_proxy_used_in_base_session(self):
+        with patch("tconnectsync.api.common.secret") as mock_secret, \
+             patch("requests.Session.request") as mock_request:
+
+            s = base_session()
+            s.request('sentinel')
+
+            mock_request.assert_called_once_with('sentinel', proxies={
+                'http': mock_secret.REQUESTS_PROXY,
+                'https': mock_secret.REQUESTS_PROXY
+            })
+
+    def test_proxy_used_in_base_session_with_two_args(self):
+        with patch("tconnectsync.api.common.secret") as mock_secret, \
+             patch("requests.Session.request") as mock_request:
+
+            s = base_session()
+            s.request('GET', 'sentinel')
+
+            mock_request.assert_called_once_with('GET', 'sentinel', proxies={
+                'http': mock_secret.REQUESTS_PROXY,
+                'https': mock_secret.REQUESTS_PROXY
+            })
+
+    def test_proxy_used_in_base_session_with_kwargs(self):
+        with patch("tconnectsync.api.common.secret") as mock_secret, \
+             patch("requests.Session.request") as mock_request:
+
+            s = base_session()
+            s.request('GET', 'sentinel', foo={'bar': 'baz'})
+
+            mock_request.assert_called_once_with('GET', 'sentinel', foo={'bar': 'baz'}, proxies={
+                'http': mock_secret.REQUESTS_PROXY,
+                'https': mock_secret.REQUESTS_PROXY
+            })
+
+            
@@ -121,7 +121,7 @@ class TestControlIQApi(unittest.TestCase):
        tries = 0
        def fake_get(endpoint, query):
            nonlocal http_code, expected_endpoint, num_times, tries
-            if endpoint.endswith(expected_endpoint):
+            if endpoint.split("?")[0].endswith(expected_endpoint):
                if tries < num_times:
                    tries += 1
                    raise ApiException(http_code, "fake HTTP %d" % http_code)
@@ -202,12 +202,10 @@ class TestControlIQApi(unittest.TestCase):
        ciq = ControlIQApi()
        ciq.userGuid = 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee'

-        def fake_get(endpoint, query):
+        def fake_get(raw_endpoint, ignored_query):
+            endpoint, query = raw_endpoint.split("?")
            self.assertTrue(endpoint.endswith("therapytimeline/users/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"))
-            self.assertEqual(query, {
-                "startDate": "04-01-2021",
-                "endDate": "04-02-2021"
-            })
+            self.assertEqual(query, "startDate=04-01-2021&endDate=04-02-2021")

            return {"faked_json": True}

@@ -223,12 +221,10 @@ class TestControlIQApi(unittest.TestCase):
        ciq = ControlIQApi()
        ciq.userGuid = 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee'

-        def fake_get(endpoint, query):
+        def fake_get(raw_endpoint, ignored_query):
+            endpoint, query = raw_endpoint.split("?")
            self.assertTrue(endpoint.endswith("summary/users/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"))
-            self.assertEqual(query, {
-                "startDate": "04-01-2021",
-                "endDate": "04-02-2021"
-            })
+            self.assertEqual(query, "startDate=04-01-2021&endDate=04-02-2021")

            return {"faked_json": True}

@@ -10,7 +10,7 @@ from tconnectsync.api.common import ApiException
 class TestWS2Api(unittest.TestCase):
    def fake_get_with_http_500(self, num_times):
        tries = 0
-        def fake_get(endpoint, query):
+        def fake_get(endpoint, **kwargs):
            nonlocal tries, num_times
            if "therapytimeline2csv" in endpoint:
                if tries < num_times:
@@ -94,7 +94,7 @@ Report Generated On, 4/24/2021 7:50:04 PM

        rawData = self.RAW_DATA_FULL

-        def fake_get(endpoint, query):
+        def fake_get(endpoint, **kwargs):
            nonlocal rawData
            if endpoint == 'therapytimeline2csv/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/2021-04-01/2021-04-02?format=csv':
                return rawData
@@ -111,7 +111,7 @@ Report Generated On, 4/24/2021 7:50:04 PM

        rawData = ""

-        def fake_get(endpoint, query):
+        def fake_get(endpoint, **kwargs):
            nonlocal rawData
            if endpoint == 'therapytimeline2csv/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/2021-04-01/2021-04-02?format=csv':
                return rawData
@@ -0,0 +1,367 @@
+import dataclasses
+import unittest
+from tconnectsync.domain.bolus import Bolus
+
+from tconnectsync.domain.therapy_event import BolusTherapyEvent, CGMTherapyEvent
+
+class TestCGMTherapyEvent(unittest.TestCase):
+    maxDiff = None
+    sampleJson = {
+        "eventDateTime": "2022-07-21T00:00:08",
+        "eventID": 256,
+        "requestDateTime": "0001-01-01T00:00:00",
+        "type": "CGM",
+        "description": "EGV",
+        "sourceRecId": 0,
+        "eventTypeId": 0,
+        "deviceType": "t:slim X2 Insulin Pump",
+        "serialNumber": "xxx",
+        "indexId": 0,
+        "uploadId": 0,
+        "interactive": 0,
+        "tempRateId": 0,
+        "tempRateCompleted": 0,
+        "tempRateActivated": 0,
+        "egv": {
+            "estimatedGlucoseValue": 174,
+            "hypo": 0,
+            "belowTarget": 0,
+            "withinTarget": 1,
+            "aboveTarget": 0,
+            "hyper": 0
+        }
+    }
+
+    def test_parse_cgm(self):
+        e = CGMTherapyEvent.parse(self.sampleJson)
+        self.assertEqual(e.type, "CGM")
+        self.assertEqual(e.eventDateTime, "2022-07-21T00:00:08")
+        self.assertEqual(e.sourceRecId, 0)
+        self.assertEqual(e.eventID, 256)
+        self.assertEqual(e.egv, 174)
+
+class TestBolusTherapyEvent(unittest.TestCase):
+    maxDiff = None
+    standardJson = {
+        "actualTotalBolusRequested": 4.17,
+        "bolusRequestOptions": "Standard",
+        "bolusType": "Carb",
+        "carbSize": 25,
+        "correctionBolusSize": 0,
+        "correctionFactor": 30,
+        "declinedCorrection": 0,
+        "duration": 0,
+        "eventDateTime": "2022-07-21T12:27:36",
+        "eventHistoryReportDetails": "CF 1:30 - Carb Ratio 1:6 - Target BG 110",
+        "eventHistoryReportEventDesc": "Food Bolus",
+        "foodBolusSize": 4.17,
+        "iob": 2.62,
+        "isQuickBolus": 0,
+        "note": {
+            "id": 0,
+            "indexId": "573042",
+            "eventTypeId": 64,
+            "sourceRecordId": 0,
+            "eventId": 0,
+            "active": False
+        },
+        "requestDateTime": "2022-07-21T12:27:36",
+        "standard": {
+            "insulinDelivered": {
+                "completionDateTime": "2022-07-21T12:29:21",
+                "value": 4.17
+            },
+            "foodDelivered": 4.17,
+            "correctionDelivered": 0,
+            "insulinRequested": 4.17,
+            "completionStatusId": 3,
+            "completionStatusDesc": "Completed",
+            "bolusIsComplete": 1,
+            "bolusRequestId": 3362,
+            "bolusCompletionId": 3362
+        },
+        "standardPercent": 100,
+        "targetBG": 110,
+        "userOverride": 0,
+        "type": "Bolus",
+        "description": "Standard",
+        "sourceRecId": 1171853319,
+        "eventTypeId": 0,
+        "indexId": 0,
+        "uploadId": 0,
+        "interactive": 0,
+        "tempRateId": 0,
+        "tempRateCompleted": 0,
+        "tempRateActivated": 0
+    }
+
+    def test_standard_to_bolus(self):
+        e = BolusTherapyEvent.parse(self.standardJson)
+        self.assertIsNotNone(e)
+        b = e.to_bolus()
+        self.assertEqual(dataclasses.asdict(b), dataclasses.asdict(Bolus(
+            description="Standard",
+            complete="1",
+            completion="Completed",
+            request_time="2022-07-21 12:27:36-04:00",
+            completion_time="2022-07-21 12:29:21-04:00",
+            insulin="4.17",
+            requested_insulin="4.17",
+            carbs="25",
+            bg="",
+            user_override="0",
+            extended_bolus="0",
+            bolex_completion_time="",
+            bolex_start_time=""
+        )))
+
+    correctionJson = {
+        "actualTotalBolusRequested": 2.9,
+        "bg": 254,
+        "bolusRequestOptions": "Automatic Bolus/Correction",
+        "bolusType": "Automatic Correction",
+        "carbSize": 0,
+        "correctionBolusSize": 2.9,
+        "correctionFactor": 30,
+        "declinedCorrection": 0,
+        "duration": 0,
+        "eventDateTime": "2022-07-21T11:53:08",
+        "eventHistoryReportDetails": "CF 1:30 - Carb Ratio 1:0 - Target BG 110",
+        "eventHistoryReportEventDesc": "Correction Bolus",
+        "foodBolusSize": 0,
+        "isQuickBolus": 0,
+        "note": {
+            "id": 0,
+            "indexId": "572946",
+            "eventTypeId": 64,
+            "sourceRecordId": 0,
+            "eventId": 0,
+            "active": False
+        },
+        "requestDateTime": "2022-07-21T11:53:08",
+        "standard": {
+            "insulinDelivered": {
+                "completionDateTime": "2022-07-21T11:55:24",
+                "value": 2.9
+            },
+            "foodDelivered": 0,
+            "correctionDelivered": 2.9,
+            "insulinRequested": 2.9,
+            "completionStatusId": 3,
+            "completionStatusDesc": "Completed",
+            "bolusIsComplete": 1,
+            "bolusRequestId": 3361,
+            "bolusCompletionId": 3361
+        },
+        "standardPercent": 100,
+        "targetBG": 110,
+        "userOverride": 0,
+        "type": "Bolus",
+        "description": "Automatic Bolus/Correction",
+        "sourceRecId": 1171791787,
+        "eventTypeId": 0,
+        "indexId": 0,
+        "uploadId": 0,
+        "interactive": 0,
+        "tempRateId": 0,
+        "tempRateCompleted": 0,
+        "tempRateActivated": 0
+    }
+
+    def test_correction_to_bolus(self):
+        e = BolusTherapyEvent.parse(self.correctionJson)
+        self.assertIsNotNone(e)
+        b = e.to_bolus()
+        self.assertEqual(dataclasses.asdict(b), dataclasses.asdict(Bolus(
+            description="Automatic Bolus/Correction",
+            complete="1",
+            completion="Completed",
+            request_time="2022-07-21 11:53:08-04:00",
+            completion_time="2022-07-21 11:55:24-04:00",
+            insulin="2.9",
+            requested_insulin="2.9",
+            carbs="0",
+            bg="254",
+            user_override="0",
+            extended_bolus="0",
+            bolex_completion_time="",
+            bolex_start_time=""
+        )))
+    
+    extendedBolusIncompleteJson = {
+        "actualTotalBolusRequested": 0.4,
+        "bg": 131,
+        "bolex": {
+            "size": 0.2,
+            "bolexStartDateTime": "2022-08-09T23:20:04",
+            "iob": 0,
+            "completionStatusId": 0,
+            "extendedBolusIsComplete": 0,
+            "insulinRequested": 0,
+            "bolexCompletionId": 0
+        },
+        "bolusRequestOptions": "Extended",
+        "bolusType": "Carb",
+        "carbSize": 0,
+        "correctionBolusSize": 0.0,
+        "correctionFactor": 30.0,
+        "declinedCorrection": 0,
+        "duration": 15,
+        "eventDateTime": "2022-08-09T23:19:15",
+        "eventHistoryReportDetails": "CF 1:30 - Carb Ratio 1:6 - Target BG 110<br/>Override: Pump calculated Bolus = 0.0 units",
+        "eventHistoryReportEventDesc": "Food Bolus: 50&#37; Extended 15 mins",
+        "foodBolusSize": 0.0,
+        "iob": 5.87,
+        "isQuickBolus": 0,
+        "note": {
+            "id": 0,
+            "indexId": "631597",
+            "eventTypeId": 64,
+            "sourceRecordId": 0,
+            "eventId": 0,
+            "active": False
+        },
+        "requestDateTime": "2022-08-09T23:19:15",
+        "standard": {
+            "insulinDelivered": {
+                "completionDateTime": "2022-08-09T23:20:04",
+                "value": 0.2
+            },
+            "foodDelivered": 0.0,
+            "correctionDelivered": 0.0,
+            "insulinRequested": 0.2,
+            "completionStatusId": 3,
+            "completionStatusDesc": "Completed",
+            "bolusIsComplete": 1,
+            "bolusRequestId": 3636.0,
+            "bolusCompletionId": 3636.0
+        },
+        "standardPercent": 50.0,
+        "targetBG": 110,
+        "userOverride": 1,
+        "type": "Bolus",
+        "description": "Extended 50.00%/0.00",
+        "sourceRecId": 1209631944,
+        "eventTypeId": 0,
+        "indexId": 0,
+        "uploadId": 0,
+        "interactive": 0,
+        "tempRateId": 0,
+        "tempRateCompleted": 0,
+        "tempRateActivated": 0
+    }
+
+    def test_extended_bolus_incomplete_to_bolus(self):
+        e = BolusTherapyEvent.parse(self.extendedBolusIncompleteJson)
+        self.assertIsNotNone(e)
+        b = e.to_bolus()
+        self.assertEqual(dataclasses.asdict(b), dataclasses.asdict(Bolus(
+            description="Extended 50.00%/0.00",
+            complete="0",
+            completion="",
+            request_time="2022-08-09 23:19:15-04:00",
+            completion_time="2022-08-09 23:20:04-04:00",
+            insulin="0.2",
+            requested_insulin="0.2",
+            carbs="0",
+            bg="131",
+            user_override="1",
+            extended_bolus="1",
+            bolex_completion_time="",
+            bolex_start_time="2022-08-09 23:20:04-04:00"
+        )))
+    
+    extendedBolusJson = {
+        "actualTotalBolusRequested": 0.4,
+        "bg": 131,
+        "bolex": {
+            "size": 0.2,
+            "bolexStartDateTime": "2022-08-09T23:20:04",
+            "insulinDelivered": {
+                "completionDateTime": "2022-08-09T23:35:03",
+                "value": 0.2
+            },
+            "iob": 5.7,
+            "completionStatusId": 3.0,
+            "completionStatusDesc": "Completed",
+            "extendedBolusIsComplete": 1,
+            "insulinRequested": 0.2,
+            "bolexCompletionId": 16757133
+        },
+        "bolusRequestOptions": "Extended",
+        "bolusType": "Carb",
+        "carbSize": 0,
+        "correctionBolusSize": 0.0,
+        "correctionFactor": 30.0,
+        "declinedCorrection": 0,
+        "duration": 15,
+        "eventDateTime": "2022-08-09T23:19:15",
+        "eventHistoryReportDetails": "CF 1:30 - Carb Ratio 1:6 - Target BG 110<br/>Override: Pump calculated Bolus = 0.0 units",
+        "eventHistoryReportEventDesc": "Food Bolus: 50&#37; Extended 15 mins",
+        "foodBolusSize": 0.0,
+        "iob": 5.87,
+        "isQuickBolus": 0,
+        "note": {
+            "id": 0,
+            "indexId": "631597",
+            "eventTypeId": 64,
+            "sourceRecordId": 0,
+            "eventId": 0,
+            "active": False
+        },
+        "requestDateTime": "2022-08-09T23:19:15",
+        "standard": {
+            "insulinDelivered": {
+                "completionDateTime": "2022-08-09T23:20:04",
+                "value": 0.2
+            },
+            "foodDelivered": 0.0,
+            "correctionDelivered": 0.0,
+            "insulinRequested": 0.2,
+            "completionStatusId": 3,
+            "completionStatusDesc": "Completed",
+            "bolusIsComplete": 1,
+            "bolusRequestId": 3636.0,
+            "bolusCompletionId": 3636.0
+        },
+        "standardPercent": 50.0,
+        "targetBG": 110,
+        "userOverride": 1,
+        "type": "Bolus",
+        "description": "Extended 50.00%/0.00",
+        "sourceRecId": 1209631944,
+        "eventTypeId": 0,
+        "indexId": 0,
+        "uploadId": 0,
+        "interactive": 0,
+        "tempRateId": 0,
+        "tempRateCompleted": 0,
+        "tempRateActivated": 0
+    }
+
+    def test_extended_bolus_complete_to_bolus(self):
+        e = BolusTherapyEvent.parse(self.extendedBolusJson)
+        self.assertIsNotNone(e)
+        b = e.to_bolus()
+        self.assertEqual(dataclasses.asdict(b), dataclasses.asdict(Bolus(
+            description="Extended 50.00%/0.00",
+            complete="1",
+            completion="Completed",
+            request_time="2022-08-09 23:19:15-04:00",
+            completion_time="2022-08-09 23:20:04-04:00",
+            insulin="0.2",
+            requested_insulin="0.2",
+            carbs="0",
+            bg="131",
+            user_override="1",
+            extended_bolus="1",
+            bolex_completion_time="2022-08-09 23:35:03-04:00",
+            bolex_start_time="2022-08-09 23:20:04-04:00"
+        )))
+
+
+BOLUS_FULL_EXAMPLES = [
+    TestBolusTherapyEvent.standardJson,
+    TestBolusTherapyEvent.correctionJson,
+    TestBolusTherapyEvent.extendedBolusJson
+]
@@ -20,7 +20,7 @@ class NightscoutApi(tconnectsync.nightscout.NightscoutApi):
    def put_entry(self, ns_format, entity):
        self.put_entries[entity].append(ns_format)

-    def last_uploaded_entry(self, eventType):
+    def last_uploaded_entry(self, eventType, start_date=None, end_date=None):
        raise NotImplementedError

    def last_uploaded_activity(self, activityType):
@@ -162,6 +162,34 @@ class TestNightscoutEntry(unittest.TestCase):
                "device": "Pump (tconnectsync)",
            }
        )
+    
+    def test_sitechange(self):
+        self.assertEqual(
+            NightscoutEntry.sitechange(
+                created_at="2021-12-05T00:16:35.058Z",
+                reason="reason"),
+            {
+                "eventType": "Site Change",
+                "reason": "reason",
+                "notes": "reason",
+                "created_at": "2021-12-05T00:16:35.058Z",
+                "enteredBy": "Pump (tconnectsync)"
+            }
+        )
+    
+    def test_basalsuspension(self):
+        self.assertEqual(
+            NightscoutEntry.basalsuspension(
+                created_at="2021-12-05T00:16:35.058Z",
+                reason="reason"),
+            {
+                "eventType": "Basal Suspension",
+                "reason": "reason",
+                "notes": "reason",
+                "created_at": "2021-12-05T00:16:35.058Z",
+                "enteredBy": "Pump (tconnectsync)"
+            }
+        )


 if __name__ == '__main__':
@@ -1,7 +1,8 @@
 #!/usr/bin/env python3

 import unittest
-from tconnectsync.parser.tconnect import TConnectEntry
+from tconnectsync.domain.bolus import Bolus
+from tconnectsync.parser.tconnect import TConnectEntry, UnknownBasalSuspensionEventException, UnknownCIQActivityEventException

 class TestTConnectEntryBasal(unittest.TestCase):
    def test_parse_ciq_basal_entry(self):
@@ -177,7 +178,7 @@ class TestTConnectEntryBolus(unittest.TestCase):
    def test_parse_bolus_entry_std_correction(self):
        self.assertEqual(
            TConnectEntry.parse_bolus_entry(self.entryStdCorrection),
-            {
+            Bolus(**{
                "description": "Standard/Correction",
                "complete": "1",
                "completion": "Completed",
@@ -191,7 +192,7 @@ class TestTConnectEntryBolus(unittest.TestCase):
                "extended_bolus": "",
                "bolex_completion_time": None,
                "bolex_start_time": None
-        })
+        }))
    
    entryStd = {
        "Type": "Bolus",
@@ -239,7 +240,7 @@ class TestTConnectEntryBolus(unittest.TestCase):
    def test_parse_bolus_entry_std(self):
        self.assertEqual(
            TConnectEntry.parse_bolus_entry(self.entryStd),
-            {
+            Bolus(**{
                "description": "Standard",
                "complete": "1",
                "completion": "Completed",
@@ -253,7 +254,7 @@ class TestTConnectEntryBolus(unittest.TestCase):
                "extended_bolus": "",
                "bolex_completion_time": None,
                "bolex_start_time": None
-        })
+        }))
    
    entryStdAutomatic = {
        "Type": "Bolus",
@@ -301,7 +302,7 @@ class TestTConnectEntryBolus(unittest.TestCase):
    def test_parse_bolus_entry_std_automatic(self):
        self.assertEqual(
            TConnectEntry.parse_bolus_entry(self.entryStdAutomatic),
-            {
+            Bolus(**{
                "description": "Automatic Bolus/Correction",
                "complete": "1",
                "completion": "Completed",
@@ -315,7 +316,7 @@ class TestTConnectEntryBolus(unittest.TestCase):
                "extended_bolus": "",
                "bolex_completion_time": None,
                "bolex_start_time": None
-        })
+        }))
    
    entryStdIncompleteZero = {
        "Type": "Bolus",
@@ -363,7 +364,7 @@ class TestTConnectEntryBolus(unittest.TestCase):
    def test_parse_bolus_entry_std_incomplete_zero(self):
        self.assertEqual(
            TConnectEntry.parse_bolus_entry(self.entryStdIncompleteZero),
-            {
+            Bolus(**{
                "description": "Standard",
                "complete": "",
                "completion": "User Aborted",
@@ -377,7 +378,7 @@ class TestTConnectEntryBolus(unittest.TestCase):
                "extended_bolus": "",
                "bolex_completion_time": None,
                "bolex_start_time": None
-            })
+            }))
    
    entryStdIncompletePartial = {
        "Type": "Bolus",
@@ -425,7 +426,7 @@ class TestTConnectEntryBolus(unittest.TestCase):
    def test_parse_bolus_entry_std_incomplete_partial(self):
        self.assertEqual(
            TConnectEntry.parse_bolus_entry(self.entryStdIncompletePartial),
-            {
+            Bolus(**{
                "description": "Standard/Correction",
                "complete": "",
                "completion": "Terminated by Alarm",
@@ -439,7 +440,7 @@ class TestTConnectEntryBolus(unittest.TestCase):
                "extended_bolus": "",
                "bolex_completion_time": None,
                "bolex_start_time": None
-            })
+            }))

 class TestTConnectEntryReading(unittest.TestCase):
    entry1 = {
@@ -511,5 +512,128 @@ class TestTConnectEntryReading(unittest.TestCase):
        )


+class TestTConnectEntryCIQEvent(unittest.TestCase):
+    def test_parse_ciq_activity_event_sleep(self):
+        self.assertEqual(
+            TConnectEntry.parse_ciq_activity_event({
+                "continuation": None,
+                "duration": 30661,
+                "eventType": 1,
+                "timeZoneId": "America/Los_Angeles",
+                "x": 1638091836
+            }),
+            {
+                "time": "2021-11-28 01:30:36-05:00",
+                "duration_mins": (30661 / 60),
+                "event_type": "Sleep"
+            }
+        )
+
+    def test_parse_ciq_activity_event_exercise(self):
+        self.assertEqual(
+            TConnectEntry.parse_ciq_activity_event({
+                "duration": 1200,
+                "eventType": 2,
+                "continuation": None, 
+                "timeZoneId": "America/Los_Angeles",
+                "x": 1619901912
+            }),
+            {
+                "time": "2021-05-01 13:45:12-04:00",
+                "duration_mins": 20,
+                "event_type": "Exercise"
+            }
+        )
+    
+    def test_parse_ciq_activity_event_unknown_id(self):
+        self.assertRaises(
+            UnknownCIQActivityEventException, 
+            TConnectEntry.parse_ciq_activity_event,
+            {
+                "duration": 1200,
+                "eventType": 5,
+                "continuation": None, 
+                "timeZoneId": "America/Los_Angeles",
+                "x": 1619901912
+            }
+        )
+
+class TestTConnectEntryBasalSuspensionEvent(unittest.TestCase):
+    def test_parse_basalsuspension_event_sitecart(self):
+        self.assertEqual(
+            TConnectEntry.parse_basalsuspension_event({
+                'EventDateTime': '/Date(1638663490000-0000)/',
+                'SuspendReason': 'site-cart'
+            }),
+            {
+                "time": "2021-12-04 16:18:10-05:00",
+                "event_type": "Site/Cartridge Change"
+            }
+        )
+
+    def test_parse_basalsuspension_event_alarm(self):
+        self.assertEqual(
+            TConnectEntry.parse_basalsuspension_event({
+                'EventDateTime': '/Date(1637863616000-0000)/',
+                'SuspendReason': 'alarm'
+            }),
+            {
+                "time": "2021-11-25 10:06:56-05:00",
+                "event_type": "Empty Cartridge/Pump Shutdown"
+            }
+        )
+
+    def test_parse_basalsuspension_event_manual(self):
+        self.assertEqual(
+            TConnectEntry.parse_basalsuspension_event({
+                'EventDateTime': '/Date(1638662852000-0000)/',
+                'SuspendReason': 'manual'
+            }),
+            {
+                "time": "2021-12-04 16:07:32-05:00",
+                "event_type": "User Suspended"
+            }
+        )
+
+    def test_parse_basalsuspension_event_tempprofile(self):
+        self.assertEqual(
+            TConnectEntry.parse_basalsuspension_event({
+                'EventDateTime': '/Date(1640541521000-0000)/',
+                'SuspendReason': 'temp-profile'
+            }),
+            {
+                "time": "2021-12-26 09:58:41-05:00",
+                "event_type": "Basal Rate Change"
+            }
+        )
+
+    def test_parse_basalsuspension_event_basalprofile_skipped(self):
+        self.assertIsNone(
+            TConnectEntry.parse_basalsuspension_event({
+                'EventDateTime': '/Date(1638659343000-0000)/',
+                'SuspendReason': 'basal-profile',
+            })
+        )
+
+    def test_parse_basalsuspension_event_previous_skipped(self):
+        self.assertIsNone(
+            TConnectEntry.parse_basalsuspension_event({
+                'Continuation': 'continuation',
+                'EventDateTime': '/Date(1638604800000-0000)/',
+                'SuspendReason': 'previous',
+            })
+        )
+    
+    def test_parse_basalsuspension_event_unknown_suspendreason(self):
+        self.assertRaises(
+            UnknownBasalSuspensionEventException, 
+            TConnectEntry.parse_basalsuspension_event,
+            {
+                'EventDateTime': '/Date(1638604800000-0000)/',
+                'SuspendReason': 'unknown',
+            }
+        )
+
+
 if __name__ == '__main__':
    unittest.main()
@@ -0,0 +1,15 @@
+import importlib
+
+def build_secrets(**kwargs):
+    secret = importlib.reload(importlib.import_module("tconnectsync.secret"))
+    class FakeSecret(object):
+        pass
+
+    fake = FakeSecret()
+    for k in dir(secret):
+        setattr(fake, k, getattr(secret, k))
+
+    for k, v in kwargs.items():
+        setattr(fake, k, v)
+    
+    return fake
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3

 import unittest
+import copy
+
 from tconnectsync.sync.basal import process_ciq_basal_events
 from tconnectsync.parser.tconnect import TConnectEntry

@@ -22,7 +24,7 @@ class TestBasalSync(unittest.TestCase):

    @staticmethod
    def get_example_ciq_basal_events():
-        data = TestBasalSync.base.copy()
+        data = copy.deepcopy(TestBasalSync.base)
        data["basal"]["tempDeliveryEvents"] = [
            {
                "y": 0.8,
@@ -83,7 +85,7 @@ class TestBasalSync(unittest.TestCase):

    @staticmethod
    def get_example_ciq_basal_events_with_manual_suspension():
-        data = TestBasalSync.base.copy()
+        data = copy.deepcopy(TestBasalSync.base)
        data["basal"]["tempDeliveryEvents"] = []
        data["basal"]["algorithmDeliveryEvents"] = [
            {
@@ -52,7 +52,7 @@ class TestBolusSync(unittest.TestCase):
        self.assertEqual(len(bolusEvents), len(bolusData))

        def set_bg_type(entry, type):
-            entry["bg_type"] = type
+            entry.bg_type = type
            return entry

        # Expect FINGER for bolus entries with a BG because there's no matching event with the same BG
@@ -111,7 +111,7 @@ class TestBolusSync(unittest.TestCase):
        self.assertEqual(len(bolusEvents), len(bolusData))

        def set_bg_type(entry, type):
-            entry["bg_type"] = type
+            entry.bg_type = type
            return entry

        expected = [
@@ -145,7 +145,7 @@ class TestBolusSync(unittest.TestCase):
        ]

        for e in partialEntries:
-            e["description"] += " (%s: requested %s units)" % (e["completion"], e["requested_insulin"])
+            e.description += " (%s: requested %s units)" % (e.completion, e.requested_insulin)

        self.assertListEqual(bolusEvents, [
            TConnectEntry.parse_bolus_entry(d) for d in stdData
@@ -0,0 +1,368 @@
+#!/usr/bin/env python3
+
+import logging
+import unittest
+import datetime
+import contextlib
+
+from unittest.mock import patch
+
+from tconnectsync.autoupdate import Autoupdate, AutoupdateFailureError, AutoupdateFailureWarning, AutoupdateNoEventIndexesDetectedError, AutoupdateNoIndexChangeWarning
+
+from .api.fake import TConnectApi
+from .nightscout_fake import NightscoutApi
+from .secrets import build_secrets
+
+logger = logging.getLogger(__name__)
+
+def stub(*args, **kwargs):
+    pass
+
+@contextlib.contextmanager
+def build_mock_logger():
+    def fake_error(*args, **kwargs):
+        logger.error(*args, **kwargs)
+    
+    def fake_warn(*args, **kwargs):
+        logger.warning(*args, **kwargs)
+        
+    with patch("tconnectsync.autoupdate.logger.error") as mock_error, patch("tconnectsync.autoupdate.logger.warning") as mock_warn:
+        mock_error.side_effect = fake_error
+        mock_warn.side_effect = fake_warn
+        yield (mock_error, mock_warn)
+
+def num_instances_of(cls, m):
+    return sum([isinstance(i[0][0], cls) for i in m.call_args_list])
+
+class TestAutoupdate(unittest.TestCase):
+    maxDiff = None
+
+    # datetimes are unused
+    start = datetime.datetime(2021, 4, 20, 12, 0)
+    end = datetime.datetime(2021, 4, 21, 12, 0)
+
+    # each time the returned function is called, it returns the next argument
+    # until the end is reached, at which point it will repeat the last argument
+    def fake_last_event_uploaded(self, *indexes):
+        index = 0
+        def fake(*args, **kwargs):
+            nonlocal index
+            if index < len(indexes):
+                index += 1
+            data = {'maxPumpEventIndex': indexes[index-1], 'processingStatus': 1}
+            return data
+        
+        return fake
+
+    # each time the returned function is called, it returns the next argument
+    # until the end is reached, at which point it will repeat the last argument
+    def fake_process_time_range(self, *returns):
+        index = 0
+        def fake(*args, **kwargs):
+            nonlocal index
+            if index < len(returns):
+                index += 1
+            return returns[index - 1]
+        
+        return fake
+    
+    """process_time_range should always be invoked the first time"""
+    def test_process_time_range_called_on_start(self):
+        tconnect = TConnectApi()
+        tconnect._android.last_event_uploaded = self.fake_last_event_uploaded(1)
+
+        nightscout = NightscoutApi()
+
+        secret = build_secrets(
+            AUTOUPDATE_MAX_LOOP_INVOCATIONS=1,
+            AUTOUPDATE_USE_FIXED_SLEEP=True,
+            AUTOUPDATE_DEFAULT_SLEEP_SECONDS=0
+        )
+
+        with patch("tconnectsync.autoupdate.process_time_range") as mock_process_time_range:
+            mock_process_time_range.return_value = 0
+
+            u = Autoupdate(secret)
+            ret = u.process(tconnect, nightscout, self.start, self.end, pretend=False)
+            self.assertEqual(ret, 0)
+
+            self.assertEqual(mock_process_time_range.call_count, 1)
+            self.assertEqual(u.autoupdate_invocations, 1)
+            self.assertEqual(u.last_event_index, 1)
+
+
+    """process_time_range should never be called with pretend"""
+    def test_process_time_range_never_called_with_pretend(self):
+        tconnect = TConnectApi()
+        tconnect._android.last_event_uploaded = self.fake_last_event_uploaded(1)
+
+        nightscout = NightscoutApi()
+
+
+        secret = build_secrets(
+            AUTOUPDATE_MAX_LOOP_INVOCATIONS=1,
+            AUTOUPDATE_USE_FIXED_SLEEP=True,
+            AUTOUPDATE_DEFAULT_SLEEP_SECONDS=0
+        )
+
+        with patch("tconnectsync.autoupdate.process_time_range") as mock_process_time_range:
+            mock_process_time_range.return_value = 0
+
+            u = Autoupdate(secret)
+            ret = u.process(tconnect, nightscout, self.start, self.end, pretend=True)
+            self.assertEqual(ret, 0)
+
+            self.assertEqual(mock_process_time_range.call_count, 0)
+            self.assertEqual(u.autoupdate_invocations, 1)
+            self.assertEqual(u.last_event_index, 1)
+    
+
+    """
+    If the event index increases without process_time_range detecting new data,
+    AutoupdateFailureWarning should be raised.
+    """
+    def test_autoupdate_failure_warning_on_index_process_time_range_discrepancy(self):
+        tconnect = TConnectApi()
+        tconnect._android.last_event_uploaded = self.fake_last_event_uploaded(1, 2)
+
+        nightscout = NightscoutApi()
+
+        secret = build_secrets(
+            AUTOUPDATE_MAX_LOOP_INVOCATIONS=2,
+            AUTOUPDATE_USE_FIXED_SLEEP=True,
+            AUTOUPDATE_DEFAULT_SLEEP_SECONDS=0,
+            TCONNECT_EMAIL="test@email.com",
+            TCONNECT_PASSWORD="testpassword"
+        )
+
+        with patch("tconnectsync.autoupdate.process_time_range") as mock_process_time_range, build_mock_logger() as (mock_error, mock_warn):
+            mock_process_time_range.side_effect = self.fake_process_time_range(0, 0)
+
+            u = Autoupdate(secret)
+            ret = u.process(tconnect, nightscout, self.start, self.end, pretend=False)
+            self.assertEqual(ret, 0)
+
+            self.assertEqual(mock_process_time_range.call_count, 2)
+            self.assertEqual(u.autoupdate_invocations, 2)
+            self.assertEqual(u.last_event_index, 2)
+
+            self.assertEqual(num_instances_of(AutoupdateFailureWarning, mock_warn), 1)
+
+    """
+    On the first attempt, an AutoupdateFailureWarning should never be raised.
+    """
+    def test_autoupdate_no_failure_warning_on_index_process_time_range_discrepancy_first_attempt(self):
+        tconnect = TConnectApi()
+        tconnect._android.last_event_uploaded = self.fake_last_event_uploaded(1)
+
+        nightscout = NightscoutApi()
+
+        secret = build_secrets(
+            AUTOUPDATE_MAX_LOOP_INVOCATIONS=1,
+            AUTOUPDATE_USE_FIXED_SLEEP=True,
+            AUTOUPDATE_DEFAULT_SLEEP_SECONDS=0
+        )
+
+        with patch("tconnectsync.autoupdate.process_time_range") as mock_process_time_range, build_mock_logger() as (mock_error, mock_warn):
+            mock_process_time_range.side_effect = self.fake_process_time_range(0, 0)
+
+            u = Autoupdate(secret)
+            ret = u.process(tconnect, nightscout, self.start, self.end, pretend=False)
+            self.assertEqual(ret, 0)
+
+            self.assertEqual(mock_process_time_range.call_count, 1)
+            self.assertEqual(u.autoupdate_invocations, 1)
+            self.assertEqual(u.last_event_index, 1)
+
+            self.assertEqual(num_instances_of(AutoupdateFailureWarning, mock_warn), 0)
+
+
+    """
+    If the event index increases without process_time_range detecting new data
+    for AUTOUPDATE_FAILURE_MINUTES, an AutoupdateFailureError should be raised.
+    """
+    def test_autoupdate_failure_error_on_index_process_time_range_discrepancy_for_failure_minutes(self):
+        tconnect = TConnectApi()
+        tconnect._android.last_event_uploaded = self.fake_last_event_uploaded(1, 2)
+
+        nightscout = NightscoutApi()
+
+        secret = build_secrets(
+            AUTOUPDATE_MAX_LOOP_INVOCATIONS=2,
+            AUTOUPDATE_USE_FIXED_SLEEP=True,
+            AUTOUPDATE_DEFAULT_SLEEP_SECONDS=0,
+            AUTOUPDATE_FAILURE_MINUTES=0,
+            AUTOUPDATE_RESTART_ON_FAILURE=False,
+        )
+
+        with patch("tconnectsync.autoupdate.process_time_range") as mock_process_time_range, build_mock_logger() as (mock_error, mock_warn):
+            mock_process_time_range.side_effect = self.fake_process_time_range(0, 0)
+
+            u = Autoupdate(secret)
+            ret = u.process(tconnect, nightscout, self.start, self.end, pretend=False)
+            self.assertEqual(ret, 0)
+
+            self.assertEqual(mock_process_time_range.call_count, 2)
+            self.assertEqual(u.autoupdate_invocations, 2)
+            self.assertEqual(u.last_event_index, 2)
+
+            self.assertEqual(num_instances_of(AutoupdateFailureError, mock_error), 1)
+            
+    """
+    If the event index increases without process_time_range detecting new data
+    for AUTOUPDATE_FAILURE_MINUTES, and AUTOUPDATE_RESTART_ON_FAILURE is true,
+    then an AutoupdateFailureError should be raised AND 1 should be returned.
+    """
+    def test_autoupdate_failure_error_on_index_process_time_range_discrepancy_for_failure_minutes_performs_restart(self):
+        tconnect = TConnectApi()
+        tconnect._android.last_event_uploaded = self.fake_last_event_uploaded(1, 2)
+
+        nightscout = NightscoutApi()
+
+        secret = build_secrets(
+            AUTOUPDATE_MAX_LOOP_INVOCATIONS=3,
+            AUTOUPDATE_USE_FIXED_SLEEP=True,
+            AUTOUPDATE_DEFAULT_SLEEP_SECONDS=0,
+            AUTOUPDATE_FAILURE_MINUTES=0,
+            AUTOUPDATE_RESTART_ON_FAILURE=True,
+        )
+
+        with patch("tconnectsync.autoupdate.process_time_range") as mock_process_time_range, build_mock_logger() as (mock_error, mock_warn):
+            mock_process_time_range.side_effect = self.fake_process_time_range(0, 0)
+
+            u = Autoupdate(secret)
+            ret = u.process(tconnect, nightscout, self.start, self.end, pretend=False)
+            self.assertEqual(ret, 1)
+
+            self.assertEqual(mock_process_time_range.call_count, 2)
+            self.assertEqual(u.autoupdate_invocations, 1) # exits before invocations is incremented
+            self.assertEqual(u.last_event_index, 1) # exits before changed to 2
+
+            self.assertEqual(num_instances_of(AutoupdateFailureError, mock_error), 1)
+
+
+    """Validate state after first successful update"""
+    def test_state_after_first_successful_update(self):
+        tconnect = TConnectApi()
+        tconnect._android.last_event_uploaded = self.fake_last_event_uploaded(1)
+
+        nightscout = NightscoutApi()
+
+        secret = build_secrets(
+            AUTOUPDATE_MAX_LOOP_INVOCATIONS=1,
+            AUTOUPDATE_USE_FIXED_SLEEP=True,
+            AUTOUPDATE_DEFAULT_SLEEP_SECONDS=0
+        )
+
+        with patch("tconnectsync.autoupdate.process_time_range") as mock_process_time_range:
+            mock_process_time_range.side_effect = self.fake_process_time_range(1)
+
+            u = Autoupdate(secret)
+            ret = u.process(tconnect, nightscout, self.start, self.end, pretend=False)
+            self.assertEqual(ret, 0)
+
+            self.assertEqual(mock_process_time_range.call_count, 1)
+            self.assertEqual(u.autoupdate_invocations, 1)
+            self.assertEqual(u.last_event_index, 1)
+            self.assertTrue(u.last_event_time == u.last_attempt_time == u.last_successful_process_time_range)
+            self.assertEqual(len(u.time_diffs_between_updates), 0)
+
+    """Validate sleep occurs for the given fixed length when set"""
+    def test_sleep_for_fixed_length_when_set(self):
+        tconnect = TConnectApi()
+        tconnect._android.last_event_uploaded = self.fake_last_event_uploaded(1)
+
+        nightscout = NightscoutApi()
+
+        sleep_length = 3 # sentinel
+        secret = build_secrets(
+            AUTOUPDATE_MAX_LOOP_INVOCATIONS=1,
+            AUTOUPDATE_USE_FIXED_SLEEP=True,
+            AUTOUPDATE_DEFAULT_SLEEP_SECONDS=sleep_length
+        )
+
+        with patch("tconnectsync.autoupdate.process_time_range") as mock_process_time_range, patch("tconnectsync.autoupdate.time.sleep") as mock_sleep:
+            mock_process_time_range.side_effect = self.fake_process_time_range(1)
+            mock_sleep.side_effect = None
+
+            u = Autoupdate(secret)
+            ret = u.process(tconnect, nightscout, self.start, self.end, pretend=False)
+            self.assertEqual(ret, 0)
+
+            self.assertEqual(mock_process_time_range.call_count, 1)
+            self.assertEqual(u.autoupdate_invocations, 1)
+            self.assertEqual(u.last_event_index, 1)
+            self.assertTrue(mock_sleep.called)
+            self.assertEqual(mock_sleep.call_args[0], (sleep_length,))
+
+
+    """
+    If there is no event index update for AUTOUPDATE_NO_DATA_FAILURE_MINUTES, 
+    then a AutoupdateNoEventIndexesDetectedError should be raised and
+    a restart should be triggered with AUTOUPDATE_RESTART_ON_FAILURE.
+    """
+    def test_autoupdate_no_event_indexes_detected_error_on_no_index_change_less_than_three_iterations(self):
+        tconnect = TConnectApi()
+        tconnect._android.last_event_uploaded = self.fake_last_event_uploaded(1)
+
+        nightscout = NightscoutApi()
+
+        secret = build_secrets(
+            AUTOUPDATE_MAX_LOOP_INVOCATIONS=100,
+            AUTOUPDATE_USE_FIXED_SLEEP=True,
+            AUTOUPDATE_DEFAULT_SLEEP_SECONDS=0.1,
+            AUTOUPDATE_UNEXPECTED_NO_INDEX_SLEEP_SECONDS=0.2,
+            AUTOUPDATE_RESTART_ON_FAILURE=True,
+            AUTOUPDATE_NO_DATA_FAILURE_MINUTES=1/600 # 0.1 second
+        )
+
+        # with more than 3 iterations, the sleep iteration will change
+
+        with patch("tconnectsync.autoupdate.process_time_range") as mock_process_time_range, build_mock_logger() as (mock_error, mock_warn):
+            mock_process_time_range.side_effect = self.fake_process_time_range(1, 0)
+
+            u = Autoupdate(secret)
+            ret = u.process(tconnect, nightscout, self.start, self.end, pretend=False)
+            self.assertEqual(ret, 1)
+
+            self.assertEqual(num_instances_of(AutoupdateNoEventIndexesDetectedError, mock_error), 1)
+
+
+    """
+    If there has been 3 failed attempts since the last time we found new data,
+    we should sleep for AUTOUPDATE_UNEXPECTED_NO_INDEX_SLEEP_SECONDS and
+    a AutoupdateNoIndexChangeWarning should be logged.
+    """
+    def test_autoupdate_no_index_change_warning_on_unexpected_no_index_sleep(self):
+        tconnect = TConnectApi()
+        tconnect._android.last_event_uploaded = self.fake_last_event_uploaded(1)
+
+        nightscout = NightscoutApi()
+
+        secret = build_secrets(
+            AUTOUPDATE_MAX_LOOP_INVOCATIONS=5,
+            AUTOUPDATE_USE_FIXED_SLEEP=True,
+            AUTOUPDATE_DEFAULT_SLEEP_SECONDS=0.1,
+            AUTOUPDATE_UNEXPECTED_NO_INDEX_SLEEP_SECONDS=0.2
+        )
+
+        with patch("tconnectsync.autoupdate.process_time_range") as mock_process_time_range, patch("tconnectsync.autoupdate.time.sleep") as mock_sleep, build_mock_logger() as (mock_error, mock_warn):
+            mock_process_time_range.side_effect = self.fake_process_time_range(0)
+            mock_sleep.side_effect = None
+
+            u = Autoupdate(secret)
+            ret = u.process(tconnect, nightscout, self.start, self.end, pretend=False)
+            self.assertEqual(ret, 0)
+
+            self.assertEqual(u.autoupdate_invocations, 5)
+            self.assertEqual(u.last_event_index, 1)
+            self.assertTrue(mock_sleep.called)
+            self.assertEqual(len(mock_sleep.call_args_list), 5)
+            self.assertEqual(mock_sleep.call_args_list[0][0], (0.1,))
+            self.assertEqual(mock_sleep.call_args_list[1][0], (0.1,))
+            self.assertEqual(mock_sleep.call_args_list[2][0], (0.1,))
+            self.assertEqual(mock_sleep.call_args_list[3][0], (0.2,))
+            self.assertEqual(mock_sleep.call_args_list[4][0], (0.2,))
+
+            self.assertEqual(num_instances_of(AutoupdateNoIndexChangeWarning, mock_warn), 2)
+
@@ -3,10 +3,12 @@
 import unittest
 import datetime
 import pprint
+import copy

 from tconnectsync.process import process_time_range
-from tconnectsync.parser.nightscout import IOB_ACTIVITYTYPE, NightscoutEntry
-from tconnectsync.features import BASAL, BOLUS, IOB
+from tconnectsync.parser.nightscout import EXERCISE_EVENTTYPE, IOB_ACTIVITYTYPE, SLEEP_EVENTTYPE, NightscoutEntry
+from tconnectsync.features import BASAL, BOLUS, IOB, PUMP_EVENTS
+from tests.domain.test_therapy_event import BOLUS_FULL_EXAMPLES, TestCGMTherapyEvent

 from .api.fake import TConnectApi
 from .nightscout_fake import NightscoutApi
@@ -18,7 +20,12 @@ class TestProcessTimeRange(unittest.TestCase):
    maxDiff = None

    def stub_therapy_timeline(self, time_start, time_end):
-        pass
+        return copy.deepcopy(TestBasalSync.base)
+    
+    def stub_ciq_therapy_events(self, time_start, time_end):
+        return {
+            "event": []
+        }

    def stub_therapy_timeline_csv(self, time_start, time_end):
        return {
@@ -27,11 +34,14 @@ class TestProcessTimeRange(unittest.TestCase):
            "basalData": [],
            "bolusData": []
        }
+    
+    def stub_ws2_basalsuspension(self, time_start, time_end):
+        return {"BasalSuspension": []}

-    def stub_last_uploaded_entry(self, event_type):
+    def stub_last_uploaded_entry(self, event_type, **kwargs):
        return None

-    def stub_last_uploaded_activity(self, activity_type):
+    def stub_last_uploaded_activity(self, activity_type, **kwargs):
        return None

    """No data in Nightscout. Uploads all basal data from tconnect."""
@@ -49,6 +59,7 @@ class TestProcessTimeRange(unittest.TestCase):
            return TestBasalSync.get_example_ciq_basal_events()

        tconnect.controliq.therapy_timeline = fake_therapy_timeline
+        tconnect.controliq.therapy_events = self.stub_ciq_therapy_events
        tconnect.ws2.therapy_timeline_csv = self.stub_therapy_timeline_csv

        nightscout = NightscoutApi()
@@ -56,7 +67,7 @@ class TestProcessTimeRange(unittest.TestCase):
        nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
        nightscout.last_uploaded_activity = self.stub_last_uploaded_activity

-        process_time_range(tconnect, nightscout, start, end, pretend=False)
+        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL])

        self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 4)
        self.assertDictEqual(dict(nightscout.uploaded_entries), {
@@ -84,6 +95,7 @@ class TestProcessTimeRange(unittest.TestCase):
            return TestBasalSync.get_example_ciq_basal_events()

        tconnect.controliq.therapy_timeline = fake_therapy_timeline
+        tconnect.controliq.therapy_events = self.stub_ciq_therapy_events
        tconnect.ws2.therapy_timeline_csv = self.stub_therapy_timeline_csv

        nightscout = NightscoutApi()
@@ -112,11 +124,12 @@ class TestProcessTimeRange(unittest.TestCase):
            return TestBasalSync.get_example_ciq_basal_events()

        tconnect.controliq.therapy_timeline = fake_therapy_timeline
+        tconnect.controliq.therapy_events = self.stub_ciq_therapy_events
        tconnect.ws2.therapy_timeline_csv = self.stub_therapy_timeline_csv

        nightscout = NightscoutApi()

-        def fake_last_uploaded_entry(event_type):
+        def fake_last_uploaded_entry(event_type, **kwargs):
            if event_type == "Temp Basal":
                return {
                    "created_at": "2021-03-16 00:20:21-04:00",
@@ -126,7 +139,7 @@ class TestProcessTimeRange(unittest.TestCase):
        nightscout.last_uploaded_entry = fake_last_uploaded_entry
        nightscout.last_uploaded_activity = self.stub_last_uploaded_activity

-        process_time_range(tconnect, nightscout, start, end, pretend=False)
+        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL])

        self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 2)
        self.assertDictEqual(dict(nightscout.uploaded_entries), {
@@ -155,11 +168,12 @@ class TestProcessTimeRange(unittest.TestCase):
            return TestBasalSync.get_example_ciq_basal_events()

        tconnect.controliq.therapy_timeline = fake_therapy_timeline
+        tconnect.controliq.therapy_events = self.stub_ciq_therapy_events
        tconnect.ws2.therapy_timeline_csv = self.stub_therapy_timeline_csv

        nightscout = NightscoutApi()

-        def fake_last_uploaded_entry(event_type):
+        def fake_last_uploaded_entry(event_type, **kwargs):
            if event_type == "Temp Basal":
                return {
                    "created_at": "2021-03-16 00:20:21-04:00",
@@ -170,7 +184,7 @@ class TestProcessTimeRange(unittest.TestCase):
        nightscout.last_uploaded_entry = fake_last_uploaded_entry
        nightscout.last_uploaded_activity = self.stub_last_uploaded_activity

-        process_time_range(tconnect, nightscout, start, end, pretend=False)
+        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL])

        self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 2)
        self.assertDictEqual(nightscout.uploaded_entries, {
@@ -189,8 +203,8 @@ class TestProcessTimeRange(unittest.TestCase):
        })
        self.assertListEqual(nightscout.deleted_entries, [])

-    """No data in Nightscout. Uploads all bolus data from tconnect."""
-    def test_new_ciq_bolus_data(self):
+    """No data in Nightscout. Uploads all bolus data from tconnect via the WS2 API."""
+    def test_new_ciq_bolus_data_from_ws2(self):
        tconnect = TConnectApi()

        # datetimes are unused by the API fake
@@ -198,6 +212,7 @@ class TestProcessTimeRange(unittest.TestCase):
        end = datetime.datetime(2021, 4, 21, 12, 0)

        tconnect.controliq.therapy_timeline = self.stub_therapy_timeline
+        tconnect.controliq.therapy_events = self.stub_ciq_therapy_events

        bolusData = TestBolusSync.get_example_csv_bolus_events()
        def fake_therapy_timeline_csv(time_start, time_end):
@@ -213,7 +228,7 @@ class TestProcessTimeRange(unittest.TestCase):
        nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
        nightscout.last_uploaded_activity = self.stub_last_uploaded_activity

-        process_time_range(tconnect, nightscout, start, end, pretend=False)
+        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL])

        pprint.pprint(nightscout.uploaded_entries)
        self.assertEqual(len(nightscout.uploaded_entries["treatments"]), len(bolusData))
@@ -227,6 +242,46 @@ class TestProcessTimeRange(unittest.TestCase):
        self.assertDictEqual(nightscout.put_entries, {})
        self.assertListEqual(nightscout.deleted_entries, [])

+    """No data in Nightscout. Uploads all bolus data from tconnect via CIQ therapy_events."""
+    def test_new_ciq_bolus_data_from_ciq_therapy_events(self):
+        tconnect = TConnectApi()
+
+        # datetimes are unused by the API fake
+        start = datetime.datetime(2022, 8, 9, 12, 0)
+        end = datetime.datetime(2021, 8, 10, 12, 0)
+
+        tconnect.controliq.therapy_timeline = self.stub_therapy_timeline
+
+        def fake_ciq_therapy_events(time_start, time_end):
+            return {
+                "event": BOLUS_FULL_EXAMPLES
+            }
+        tconnect.controliq.therapy_events = fake_ciq_therapy_events
+
+        tconnect.ws2.therapy_timeline_csv = self.stub_therapy_timeline_csv
+
+        nightscout = NightscoutApi()
+
+        nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
+        nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
+
+        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL])
+
+        pprint.pprint(nightscout.uploaded_entries)
+        self.assertEqual(len(nightscout.uploaded_entries["treatments"]), len(BOLUS_FULL_EXAMPLES))
+        self.assertDictEqual(dict(nightscout.uploaded_entries), {
+            "treatments": [
+                # BGs are excluded because BG is not enabled in features for this test
+                NightscoutEntry.bolus(2.9, 0, "2022-07-21 11:55:24-04:00", notes="Automatic Bolus/Correction"),
+                NightscoutEntry.bolus(4.17, 25, "2022-07-21 12:29:21-04:00", notes="Standard"),
+                # NOTE: the extended bolus is 0.2+0.2 but we currently only surface standard
+                # BUG: inconsistency: we use the completion timestamp as the event timestamp for standard boluses,
+                # but the standard strand time for extended
+                NightscoutEntry.bolus(0.2, 0, "2022-08-09 23:20:04-04:00", notes="Extended 50.00%/0.00 (Override) (Extended)"),
+        ]})
+        self.assertDictEqual(nightscout.put_entries, {})
+        self.assertListEqual(nightscout.deleted_entries, [])
+
    """No data in Nightscout. Nothing should be updated in Nightscout without the BOLUS feature."""
    def test_bolus_data_not_updated_without_feature(self):
        tconnect = TConnectApi()
@@ -267,6 +322,7 @@ class TestProcessTimeRange(unittest.TestCase):
        end = datetime.datetime(2021, 4, 21, 12, 0)

        tconnect.controliq.therapy_timeline = self.stub_therapy_timeline
+        tconnect.controliq.therapy_events = self.stub_ciq_therapy_events

        iobData = TestIOBSync.get_example_csv_iob_events()
        def fake_therapy_timeline_csv(time_start, time_end):
@@ -282,7 +338,7 @@ class TestProcessTimeRange(unittest.TestCase):
        nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
        nightscout.last_uploaded_activity = self.stub_last_uploaded_activity

-        process_time_range(tconnect, nightscout, start, end, pretend=False)
+        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL, IOB])

        pprint.pprint(nightscout.uploaded_entries)
        self.assertEqual(len(nightscout.uploaded_entries["activity"]), 1)
@@ -303,6 +359,7 @@ class TestProcessTimeRange(unittest.TestCase):
        end = datetime.datetime(2021, 4, 21, 12, 0)

        tconnect.controliq.therapy_timeline = self.stub_therapy_timeline
+        tconnect.controliq.therapy_events = self.stub_ciq_therapy_events

        iobData = TestIOBSync.get_example_csv_iob_events()
        def fake_therapy_timeline_csv(time_start, time_end):
@@ -350,14 +407,14 @@ class TestProcessTimeRange(unittest.TestCase):

        nightscout.last_uploaded_entry = self.stub_last_uploaded_entry

-        def fake_last_uploaded_activity(activityType):
+        def fake_last_uploaded_activity(activityType, **kwargs):
            if activityType == IOB_ACTIVITYTYPE:
                return iobData[0]
            return self.stub_last_uploaded_activity(activityType)

        nightscout.last_uploaded_activity = fake_last_uploaded_activity

-        process_time_range(tconnect, nightscout, start, end, pretend=False)
+        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[IOB])

        pprint.pprint(nightscout.uploaded_entries)
        self.assertEqual(len(nightscout.uploaded_entries["activity"]), 1)
@@ -370,8 +427,328 @@ class TestProcessTimeRange(unittest.TestCase):
        self.assertListEqual(nightscout.deleted_entries, [
            "activity/sentinel_existing_iob_id"
        ])
+    
+    """No pump activity events in Nightscout. New CIQ activity events."""
+    def test_new_ciq_activity_events(self):
+        tconnect = TConnectApi()

+        # datetimes are unused by the API fake
+        start = datetime.datetime(2021, 5, 1, 0, 0)
+        end = datetime.datetime(2021, 5, 3, 0, 0)

+        def fake_therapy_timeline(time_start, time_end):
+            self.assertEqual(time_start, start)
+            self.assertEqual(time_end, end)
+
+            return {
+                **TestBasalSync.base,
+                "events": [{
+                    "duration": 1200,
+                    "eventType": 2, # Exercise
+                    "continuation": None, 
+                    "timeZoneId": "America/Los_Angeles",
+                    "x": 1619901912 # 2021-05-01 13:45:12-04:00
+                }, {
+                    "duration": 30661,
+                    "eventType": 1, # Sleep
+                    "continuation": None,
+                    "timeZoneId": "America/Los_Angeles",
+                    "x": 1619992000 # 2021-05-02 14:46:40-04:00
+                }]
+            }
+
+        tconnect.controliq.therapy_timeline = fake_therapy_timeline
+        tconnect.ws2.therapy_timeline_csv = self.stub_therapy_timeline_csv
+        tconnect.ws2.basalsuspension = self.stub_ws2_basalsuspension
+
+        nightscout = NightscoutApi()
+
+        nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
+        nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
+
+        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PUMP_EVENTS])
+
+        self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 2)
+        self.assertDictEqual(dict(nightscout.uploaded_entries), {
+            "treatments": [
+                NightscoutEntry.activity(created_at="2021-05-01 13:45:12-04:00", duration=20, reason="Exercise", event_type=EXERCISE_EVENTTYPE),
+                NightscoutEntry.activity(created_at="2021-05-02 14:46:40-04:00", duration=30661/60, reason="Sleep", event_type=SLEEP_EVENTTYPE),
+        ]})
+        self.assertDictEqual(nightscout.put_entries, {})
+        self.assertListEqual(nightscout.deleted_entries, [])
+
+    """No pump activity events in Nightscout. New CIQ activity events, but feature is disabled."""
+    def test_no_ciq_activity_events_without_feature(self):
+        tconnect = TConnectApi()
+
+        # datetimes are unused by the API fake
+        start = datetime.datetime(2021, 5, 1, 0, 0)
+        end = datetime.datetime(2021, 5, 3, 0, 0)
+
+        def fake_therapy_timeline(time_start, time_end):
+            self.assertEqual(time_start, start)
+            self.assertEqual(time_end, end)
+
+            return {
+                **TestBasalSync.base,
+                "events": [{
+                    "duration": 1200,
+                    "eventType": 2, # Exercise
+                    "continuation": None, 
+                    "timeZoneId": "America/Los_Angeles",
+                    "x": 1619901912 # 2021-05-01 13:45:12-04:00
+                }, {
+                    "duration": 30661,
+                    "eventType": 1, # Sleep
+                    "continuation": None,
+                    "timeZoneId": "America/Los_Angeles",
+                    "x": 1619992000 # 2021-05-02 14:46:40-04:00
+                }]
+            }
+
+        tconnect.controliq.therapy_timeline = fake_therapy_timeline
+        tconnect.controliq.therapy_events = self.stub_ciq_therapy_events
+        tconnect.ws2.therapy_timeline_csv = self.stub_therapy_timeline_csv
+        tconnect.ws2.basalsuspension = self.stub_ws2_basalsuspension
+
+        nightscout = NightscoutApi()
+
+        nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
+        nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
+
+        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL, IOB])
+
+        self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 0)
+        self.assertDictEqual(nightscout.put_entries, {})
+        self.assertListEqual(nightscout.deleted_entries, [])
+
+    
+    """
+    Existing Sleep event in Nightscout with shorter duration than current, as well as a past Exercise event.
+    Ensures that the old sleep event is deleted and a new one is created with the correct duration."""
+    def test_existing_ciq_activity_events(self):
+        tconnect = TConnectApi()
+
+        # datetimes are unused by the API fake
+        start = datetime.datetime(2021, 5, 1, 0, 0)
+        end = datetime.datetime(2021, 5, 3, 0, 0)
+
+        def fake_therapy_timeline(time_start, time_end):
+            self.assertEqual(time_start, start)
+            self.assertEqual(time_end, end)
+
+            return {
+                **TestBasalSync.base,
+                "events": [{
+                    "duration": 1200,
+                    "eventType": 2, # Exercise
+                    "continuation": None, 
+                    "timeZoneId": "America/Los_Angeles",
+                    "x": 1619901912 # 2021-05-01 13:45:12-04:00
+                }, {
+                    "duration": 4200, # Currently 60 mins (3600), changing to 70 mins (4200)
+                    "eventType": 1, # Sleep
+                    "continuation": None,
+                    "timeZoneId": "America/Los_Angeles",
+                    "x": 1619992000 # 2021-05-02 14:46:40-04:00
+                }]
+            }
+
+        tconnect.controliq.therapy_timeline = fake_therapy_timeline
+        tconnect.ws2.therapy_timeline_csv = self.stub_therapy_timeline_csv
+        tconnect.ws2.basalsuspension = self.stub_ws2_basalsuspension
+
+        nightscout = NightscoutApi()
+
+        def fake_last_uploaded_entry(event_type, **kwargs):
+            if event_type == "Sleep":
+                return {
+                    "created_at": "2021-05-02 14:46:40-04:00",
+                    "duration": 60,
+                    "_id": "old_sleep"
+                }
+            elif event_type == "Exercise":
+                return {
+                    "created_at": "2021-05-01 13:45:12-04:00",
+                    "duration": 20,
+                    "_id": "exercise"
+                }
+            return self.stub_last_uploaded_entry(**kwargs)
+
+        nightscout.last_uploaded_entry = fake_last_uploaded_entry
+        nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
+
+        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PUMP_EVENTS])
+
+        self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 1)
+        self.assertDictEqual(dict(nightscout.uploaded_entries), {
+            "treatments": [
+                # Already exists:
+                # NightscoutEntry.activity(created_at="2021-05-01 13:45:12-04:00", duration=20, reason="Exercise", event_type=EXERCISE_EVENTTYPE),
+                # Updated event duration:
+                NightscoutEntry.activity(created_at="2021-05-02 14:46:40-04:00", duration=70, reason="Sleep", event_type=SLEEP_EVENTTYPE),
+        ]})
+        self.assertDictEqual(nightscout.put_entries, {})
+        self.assertEqual(len(nightscout.deleted_entries), 1)
+        self.assertListEqual(nightscout.deleted_entries, [
+            "treatments/old_sleep"
+        ])
+
+    """No pump activity events in Nightscout. New WS2 activity events."""
+    def test_new_ws2_activity_events(self):
+        tconnect = TConnectApi()
+
+        # datetimes are unused by the API fake
+        start = datetime.datetime(2021, 5, 1, 0, 0)
+        end = datetime.datetime(2021, 5, 3, 0, 0)
+
+        tconnect.controliq.therapy_timeline = self.stub_therapy_timeline
+        tconnect.ws2.therapy_timeline_csv = self.stub_therapy_timeline_csv
+
+        def fake_basalsuspension(time_start, time_end):            
+            self.assertEqual(time_start, start)
+            self.assertEqual(time_end, end)
+
+            return {"BasalSuspension": [
+                {
+                    'EventDateTime': '/Date(1638663490000-0000)/',
+                    'SuspendReason': 'site-cart'
+                },
+                {
+                    'EventDateTime': '/Date(1637863616000-0000)/',
+                    'SuspendReason': 'alarm'
+                },
+                {
+                    'EventDateTime': '/Date(1638662852000-0000)/',
+                    'SuspendReason': 'manual'
+                }
+            ]}
+
+        tconnect.ws2.basalsuspension = fake_basalsuspension
+
+        nightscout = NightscoutApi()
+
+        nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
+        nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
+
+        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PUMP_EVENTS])
+
+        self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 3)
+        self.assertDictEqual(dict(nightscout.uploaded_entries), {
+            "treatments": [
+                NightscoutEntry.sitechange(created_at="2021-12-04 16:18:10-05:00", reason="Site/Cartridge Change"),
+                NightscoutEntry.basalsuspension(created_at="2021-11-25 10:06:56-05:00", reason="Empty Cartridge/Pump Shutdown"),
+                NightscoutEntry.basalsuspension(created_at="2021-12-04 16:07:32-05:00", reason="User Suspended")
+        ]})
+        self.assertDictEqual(nightscout.put_entries, {})
+        self.assertListEqual(nightscout.deleted_entries, [])
+
+    """Existing pump activity events in Nightscout. New WS2 activity events. Only adds new events."""
+    def test_existing_ws2_activity_events(self):
+        tconnect = TConnectApi()
+
+        # datetimes are unused by the API fake
+        start = datetime.datetime(2021, 5, 1, 0, 0)
+        end = datetime.datetime(2021, 5, 3, 0, 0)
+
+        tconnect.controliq.therapy_timeline = self.stub_therapy_timeline
+        tconnect.ws2.therapy_timeline_csv = self.stub_therapy_timeline_csv
+
+        def fake_basalsuspension(time_start, time_end):            
+            self.assertEqual(time_start, start)
+            self.assertEqual(time_end, end)
+
+            return {"BasalSuspension": [
+                {
+                    'EventDateTime': '/Date(1638663490000-0000)/',
+                    'SuspendReason': 'site-cart'
+                },
+                {
+                    'EventDateTime': '/Date(1637863616000-0000)/',
+                    'SuspendReason': 'alarm'
+                },
+                {
+                    'EventDateTime': '/Date(1638662852000-0000)/',
+                    'SuspendReason': 'manual'
+                },
+                # This event is new:
+                {
+                    'EventDateTime': '/Date(1638672852000-0000)/',
+                    'SuspendReason': 'manual'
+                }
+            ]}
+
+        tconnect.ws2.basalsuspension = fake_basalsuspension
+
+        nightscout = NightscoutApi()
+
+        def fake_last_uploaded_entry(event_type, **kwargs):
+            if event_type == "Site Change":
+                return {
+                    "created_at": "2021-12-04 16:18:10-05:00"
+                }
+            elif event_type == "Basal Suspension":
+                return {
+                    "created_at": "2021-12-04 16:07:32-05:00"
+                }
+            return self.stub_last_uploaded_entry(**kwargs)
+
+        nightscout.last_uploaded_entry = fake_last_uploaded_entry
+        nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
+
+        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PUMP_EVENTS])
+
+        self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 1)
+        self.assertDictEqual(dict(nightscout.uploaded_entries), {
+            "treatments": [
+                NightscoutEntry.basalsuspension(created_at="2021-12-04 18:54:12-05:00", reason="User Suspended")
+        ]})
+        self.assertDictEqual(nightscout.put_entries, {})
+        self.assertListEqual(nightscout.deleted_entries, [])
+
+    """No pump activity events in nightscout. New WS2 activity events, but only of skipped types. None should be added."""
+    def test_skipped_ws2_activity_events(self):
+        tconnect = TConnectApi()
+
+        # datetimes are unused by the API fake
+        start = datetime.datetime(2021, 5, 1, 0, 0)
+        end = datetime.datetime(2021, 5, 3, 0, 0)
+
+        tconnect.controliq.therapy_timeline = self.stub_therapy_timeline
+        tconnect.ws2.therapy_timeline_csv = self.stub_therapy_timeline_csv
+
+        def fake_basalsuspension(time_start, time_end):            
+            self.assertEqual(time_start, start)
+            self.assertEqual(time_end, end)
+
+            return {"BasalSuspension": [
+                {
+                    'EventDateTime': '/Date(1638659343000-0000)/',
+                    'SuspendReason': 'basal-profile',
+                },
+                {
+                    'Continuation': 'continuation',
+                    'EventDateTime': '/Date(1638604800000-0000)/',
+                    'SuspendReason': 'previous',
+                },
+                {
+                    'EventDateTime': '/Date(1638659343000-0000)/',
+                    'SuspendReason': 'basal-profile',
+                }
+            ]}
+
+        tconnect.ws2.basalsuspension = fake_basalsuspension
+
+        nightscout = NightscoutApi()
+
+        nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
+        nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
+
+        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PUMP_EVENTS])
+
+        self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 0)
+        self.assertDictEqual(nightscout.put_entries, {})
+        self.assertListEqual(nightscout.deleted_entries, [])


 if __name__ == '__main__':
@@ -0,0 +1,106 @@
+#!/usr/bin/env python3
+
+import unittest
+import unittest.mock
+import tempfile
+import importlib
+import contextlib
+import pathlib
+import os
+
+@contextlib.contextmanager
+def chdir(dir):
+    orig_cwd = os.getcwd()
+    os.chdir(dir)
+
+    try:
+        yield
+    finally:
+        os.chdir(orig_cwd)
+
+class TestSecretDotEnv(unittest.TestCase):
+    maxDiff = None
+
+    def setUp(self):
+        if 'TCONNECT_EMAIL' in os.environ:
+            del os.environ['TCONNECT_EMAIL']
+
+        if 'NS_URL' in os.environ:
+            del os.environ['NS_URL']
+
+    def write_test_dotenv_file(self, path, type):
+        with open(os.path.join(path, ".env"), "w") as f:
+            f.write("""
+TCONNECT_EMAIL=test_%s_email@email.com
+NS_URL=http://test_%s_url
+            """ % (type, type))
+            f.close()
+    
+    def import_secret(self):
+        return importlib.reload(importlib.import_module("tconnectsync.secret"))
+
+    def test_dotenv_in_current_working_directory(self):
+        with tempfile.TemporaryDirectory(prefix='dotenv_cwd') as dir, chdir(dir):
+            self.write_test_dotenv_file(dir, "dotenv_cwd")
+
+            secret = self.import_secret()
+            self.assertEqual(secret.TCONNECT_EMAIL, "test_dotenv_cwd_email@email.com")
+            self.assertEqual(secret.NS_URL, "http://test_dotenv_cwd_url")
+
+    def test_dotenv_in_homedir_config_folder(self):
+        with tempfile.TemporaryDirectory(prefix='dotenv_homedir_config') as dir, chdir(dir):
+            config_dir = os.path.join(dir, '.config/tconnectsync')
+            os.makedirs(config_dir)
+
+            self.write_test_dotenv_file(config_dir, "dotenv_homedir_config")
+
+            with unittest.mock.patch.object(pathlib.Path, "home") as mock_home:
+                mock_home.return_value = dir
+
+                secret = self.import_secret()
+                self.assertEqual(secret.TCONNECT_EMAIL, "test_dotenv_homedir_config_email@email.com")
+                self.assertEqual(secret.NS_URL, "http://test_dotenv_homedir_config_url")
+
+    def test_no_dotenv_file_reads_from_environment(self):
+        with tempfile.TemporaryDirectory(prefix='dotenv_environ') as dir, chdir(dir):
+            environ = {
+                "TCONNECT_EMAIL": "test_environ_email@email.com", 
+                "NS_URL": "http://test_environ_url"
+            }
+
+            with unittest.mock.patch.dict(os.environ, environ):
+                secret = self.import_secret()
+                self.assertEqual(secret.TCONNECT_EMAIL, environ["TCONNECT_EMAIL"])
+                self.assertEqual(secret.NS_URL, environ["NS_URL"])
+
+    def test_environment_merges_with_dotenv_file(self):
+        with tempfile.TemporaryDirectory(prefix='env_plus_environ') as dir, chdir(dir):
+            self.write_test_dotenv_file(dir, "dotenv_cwd_defaults")
+
+            environ = {
+                "TCONNECT_EMAIL": "test_environ_override_email@email.com"
+            }
+
+            with unittest.mock.patch.dict(os.environ, environ):
+                secret = self.import_secret()
+                self.assertEqual(secret.TCONNECT_EMAIL, "test_environ_override_email@email.com")
+                self.assertEqual(secret.NS_URL, "http://test_dotenv_cwd_defaults_url")
+
+    def test_dotenv_in_current_working_directory_overrides_homedir_config(self):
+        with tempfile.TemporaryDirectory(prefix='dotenv_cwd') as dir, chdir(dir):
+            self.write_test_dotenv_file(dir, "dotenv_cwd")
+
+            config_dir = os.path.join(dir, '.config/tconnectsync')
+            os.makedirs(config_dir)
+
+            self.write_test_dotenv_file(config_dir, "dotenv_homedir_config")
+
+            with unittest.mock.patch.object(pathlib.Path, "home") as mock_home:
+                mock_home.return_value = dir
+
+                secret = self.import_secret()
+                self.assertEqual(secret.TCONNECT_EMAIL, "test_dotenv_cwd_email@email.com")
+                self.assertEqual(secret.NS_URL, "http://test_dotenv_cwd_url")
+
+if __name__ == '__main__':
+    unittest.main()
Author	SHA1	Message	Date
James Woglom	62f1322ef6	v0.8.7	2022-12-02 20:48:51 -05:00
James Woglom	139ccb1878	ignore python3.7 pipenv check warning	2022-12-02 20:48:12 -05:00
James Woglom	e60e9ce537	version 0.8.6	2022-12-02 20:42:35 -05:00
James Woglom	6e180d9f2a	add basal therapy event type, now that Tandem is storing it along with bolus/cgm/bgs	2022-12-02 20:42:35 -05:00
Jarred YawandJames Woglom	b929d1151e	Moved logger.warn() statements to logger.warning() due to the deprecation msgs I was getting while testing	2022-10-02 00:18:11 -04:00
James Woglom	4d4ee7b425	v0.8.5	2022-10-02 00:07:32 -04:00
James Woglom	0c5a6d5453	when last_uploaded query returns None, try with fixed timestamp	2022-10-02 00:05:08 -04:00
James Woglom	0b7e33db96	allow self-signed SSL cert with NS_SKIP_TLS_VERIFY (fixes #63 )	2022-10-01 23:49:16 -04:00
James Woglom	5d58b23d27	v0.8.4	2022-09-17 10:31:23 -04:00
James Woglom	40aea810cc	pass kwargs to ws2 query	2022-09-17 10:30:01 -04:00
Ryan StutsmanandJames Woglom	ec84afdb7a	Fix format string in UnknownTherapyEventType. %s was missing from the format string. This enhances the message to report the unexpected thearpy type along with the dump of the event that trigger the exception.	2022-08-26 10:53:50 -04:00
James Woglom	fca7f573a3	set codecov threshold to 50%, to stop failing builds for 0.01% changes in code coverage	2022-08-26 10:53:38 -04:00
James WoglomandGitHub	76fc043a2b	Update issue templates	2022-08-24 12:55:32 -04:00
James Woglom	86e07880a9	bump to v0.8.3	2022-08-24 12:28:43 -04:00
Jarred YawandJames Woglom	751087373c	fix unknown therapy event error in ciq_therapy_event.py	2022-08-24 12:20:45 -04:00
Ryan StutsmanandJames Woglom	f47421e482	Replace hand-rolled date format with isoformat(). Fixes #47.	2022-08-22 16:45:46 -04:00
t1diotacandJames Woglom	dfc39d61bb	Update README.md - Added sections on creating a user-specific install and crontab. - Added bullet points on installing on CentOS/RHEL/Rocky Linux 8	2022-08-19 10:31:39 -04:00
James Woglom	e8a12e291f	version bump to 0.8.2	2022-08-12 00:20:11 -04:00
James Woglom	0ebfb2b744	add 10 second timeout on ws2 requests	2022-08-12 00:19:11 -04:00
James Woglom	8f6d03797a	update API section in readme, and check-login script to properly sanitize	2022-08-12 00:06:17 -04:00
James Woglom	6f15ef8857	use domain objects for webui scraping pump profiles	2022-08-11 01:22:44 -04:00
James Woglom	4da4d6e2a6	log tconnect software version	2022-08-11 00:11:46 -04:00
James Woglom	92bed13878	log times for autoupdate errors	2022-08-10 23:28:15 -04:00
James Woglom	955ac68914	improve logging	2022-08-10 02:12:19 -04:00
James Woglom	26d4c63a4d	bump to v0.8.0	2022-08-10 01:54:14 -04:00
James Woglom	81a62b8902	warning messages when falling back on Ws2	2022-08-10 01:53:31 -04:00
James Woglom	2f5775cbfb	internally track bolus from CIQ API identically at par with WS2	2022-08-10 01:31:45 -04:00
James Woglom	f13929a45a	therapy_event and tests	2022-08-10 00:22:13 -04:00
James Woglom	a18c2f3d17	move Bolus internal state from dictionary to domain object	2022-08-09 22:54:51 -04:00
James Woglom	1b400d3b22	Only connect to ws2 api when requisite feature needs that data	2022-07-26 00:07:39 -04:00
James Woglom	d3816b18b2	propagate time filter to all ns_writes	2022-07-20 02:43:31 -04:00
James Woglom	4a6dd5f51d	include time range in last_uploaded_entry (needs tests)	2022-07-20 02:29:48 -04:00
James Woglom	51abc15512	propagate -- but do not use -- time_start and time_end in last_uploaded_entry	2022-07-20 02:17:02 -04:00
James Woglom	f672a2e199	bump to v0.7.2	2022-07-20 01:36:26 -04:00
James Woglom	52031d1d8a	fix GETs with data	2022-07-20 01:32:32 -04:00
James Woglom	7139247d1c	ensure consistent user agent across runtime	2022-07-20 01:17:05 -04:00
James Woglom	f99c2b6119	HTTP 403 workarounds	2022-07-20 01:08:52 -04:00
James Woglom	0b3808d43d	fix session ordering	2022-07-20 00:39:39 -04:00
James Woglom	d4918984f8	requests version upgrade: explicitly pass data for get requests	2022-07-20 00:38:48 -04:00
James Woglom	123acaf163	fix requests proxies monkey-patch	2022-07-20 00:36:22 -04:00
James Woglom	898fb63af5	fix session creation ordering	2022-07-20 00:28:07 -04:00
James Woglom	46c4d60525	YAML was a mistake https://github.com/actions/setup-python/issues/160	2022-07-20 00:07:52 -04:00
James Woglom	e0d452bdea	drop python 3.6 support in setup.cfg	2022-07-20 00:04:44 -04:00
James Woglom	31d2185154	drop python 3.6 support. no longer supported by requests	2022-07-20 00:04:14 -04:00
James Woglom	d7cc6f957f	test proxy	2022-07-19 23:57:49 -04:00
James Woglom	ae2bf9a3a6	support proxy	2022-07-19 23:23:12 -04:00
James Woglom	fe57bd6c14	bump to 0.7.1 for consistency between pip package and github/package metadata	2022-04-06 17:51:32 -04:00
James WoglomandGitHub	0872c756d2	Only run publish-docker on tags	2022-03-17 16:32:45 -04:00
James Woglom	7d8dabb3ef	AndroidApi: match HTTP headers with app	2022-03-17 16:18:15 -04:00
James Woglom	798225c606	api: add user_agent to AndroidApi, move improperly scoped endpoint to tconnectapi	2022-03-17 16:07:57 -04:00
James WoglomandGitHub	b08b9b8c76	trigger GitHub Actions on tag push	2022-02-27 00:35:53 -05:00
James Woglom	90bbd5dc63	bump version to v0.6.6	2022-02-22 00:17:58 -05:00
James WoglomandGitHub	5e56b41b62	Update publish-docker.yml Add tags	2022-02-22 00:16:27 -05:00
James WoglomandGitHub	e8fa6c5a7c	Update publish-docker.yml Add push_to_dockerhub GitHub Action	2022-02-22 00:08:20 -05:00
James Woglom	fae1d4de2c	api: add WebUIScraper which can read pump settings and profile info	2022-01-09 18:36:49 -05:00
James Woglom	76085e8d65	version bump to 0.6.5	2022-01-08 03:56:24 -05:00
James Woglom	b4d0dad267	remove IOB feature in defaults because it is currently not displayed in the UI. document features in readme	2022-01-08 03:55:26 -05:00
James Woglom	7b22d612c3	autoupdate: refactor into class and write test	2022-01-07 00:32:50 -05:00
James Woglom	8b1ece3ac3	readme: rephrase initial section	2022-01-04 21:23:18 -05:00
James Woglom	7b06f1c457	secret: parse API_SECRET/TZ if NS_SECRET/TIMEZONE_NAME are missing	2022-01-04 21:02:20 -05:00
James Woglom	3a400390de	bump to v0.6.4	2022-01-04 00:35:44 -05:00
James Woglom	e2b30687e4	autoupdate: reset API connection when event index change is recorded but no data is found, potential fix for #11	2022-01-04 00:34:46 -05:00
James Woglom	0d956516d7	update Pipfile.lock, resolve GHSA-55x5-fj6c-h6m8	2022-01-03 17:58:51 -05:00
James Woglom	50cb57f11b	secret: use TZ to infer TIMEZONE_NAME if set	2022-01-03 17:58:51 -05:00
James Woglom	2e515efc54	check: add additional output to --check-login	2022-01-03 17:58:51 -05:00
James WoglomandGitHub	b52006b3b0	Update README to include Heroku instructions	2022-01-03 16:52:11 -05:00
James Woglom	07e5761178	bump version to 0.6.3	2021-12-27 15:58:48 -05:00
James Woglom	631d1c7b89	parser: support temp-profile basal suspension event	2021-12-27 15:56:50 -05:00
James Woglom	0253956377	test_secret: allow test to pass even if environment variables implicitly passed to pipenv test	2021-12-27 15:56:19 -05:00
James WoglomandGitHub	59816225e0	Update README.md	2021-12-23 21:59:18 -05:00
James WoglomandGitHub	be113e9cf7	Update README.md	2021-12-23 21:56:38 -05:00
James Woglom	90bede8b75	bump version to v0.6.2	2021-12-23 20:57:50 -05:00
James Woglom	7a8d00da88	secret: put environment variables at higher precedence than .env file	2021-12-23 20:46:58 -05:00
James Woglom	52cb287ce8	bump version to 0.6.1	2021-12-23 20:38:23 -05:00
James Woglom	27ba5d9a64	Update dotenv secret parsing logic, and read from .config/tconnectsync/.env path	2021-12-23 19:39:51 -05:00
James WoglomandGitHub	2140bd356e	Update README.md with note about forking the repo	2021-12-15 15:31:33 -05:00
James Woglom	a74b63ab05	bugfix: check for extended bolus start/completion time presence before parsing, since extended boluses can be in progress	2021-12-12 13:29:08 -05:00
James Woglom	b0ffe9bcfc	update to 1.6	2021-12-04 22:00:56 -05:00
James Woglom	ca4ca72476	add SKIP_NS_LAST_UPLOADED_CHECK workaround when running tconnectsync for past data. see #23	2021-12-04 21:56:30 -05:00
James Woglom	8cef3233c6	features: enable PUMP_EVENTS as optional feature	2021-12-04 21:38:13 -05:00
James Woglom	118ee236ba	test_process: add WS2 activity event process tests	2021-12-04 21:37:34 -05:00
James Woglom	1657b1c696	test_process: add test coverage for CIQ pump_events sync	2021-12-04 21:20:47 -05:00
James Woglom	0a9dd8732f	bug: use deepcopy to avoid mutating the base dictionary	2021-12-04 21:20:13 -05:00
James Woglom	dbb1389254	hack: enable debug logging in tests	2021-12-04 21:18:53 -05:00
James Woglom	163db9807b	sync/pump_events: upload events to nightscout	2021-12-04 20:28:03 -05:00
James Woglom	b1ca7eee1e	add basalsuspension parsing + tests	2021-12-04 19:02:13 -05:00
James Woglom	1fa543e3d6	add PUMP_EVENTS feature, with initial code for parsing CIQ activities (sleep mode, exercise, etc)	2021-12-04 17:41:16 -05:00