Merge v.2.65.0, v2.65.1 and v2.66.0 into main

.circleci/config.yml

@@ -26,8 +26,8 @@ jobs:
           export NVM_DIR="$HOME/.nvm"
           [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
           [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
-          nvm install v22.19.0
-          nvm alias default v22.19.0
+          nvm install v24.15.0
+          nvm alias default v24.15.0
     - run: node -v
     - run: npm install --global node-gyp
     - run: echo $SHELL
@@ -110,10 +110,10 @@ jobs:
       BASH_ENV: ".circleci/bash_env.sh"
       DISPLAY: ":99"
     docker:
-      - image: cimg/node:22.19.0-browsers
+      - image: cimg/node:24.15.0-browsers
     steps:
       - setup_remote_docker:
-          version: docker23
+          version: default
       - run: sudo apt-get update && sudo apt-get install -y build-essential git curl libusb-1.0 libavutil-dev libxss1 libsecret-1-dev libudev-dev libgtk-3-0 libcanberra-gtk3-module packagekit-gtk3-module chromium-browser fonts-liberation libappindicator3-1 libasound2t64 libatk-bridge2.0-0 libatspi2.0-0 libcairo2 libcups2 libgbm1 libgdk-pixbuf2.0-0 libgtk-3-0 libpango-1.0-0 libpangocairo-1.0-0 libxcursor1 libxss1 xdg-utils xvfb libdbus-glib-1-2 libgtk-3-dev libxt6 python3-dev python3-setuptools
       - checkout
       # - run: mv .nvmrc .nvmrc.tmp
@@ -145,8 +145,8 @@ jobs:
       - run: pwsh.exe -command "Register-PSRepository -Name 'Nuget' -SourceLocation 'https://api.nuget.org/v3/index.json' -InstallationPolicy Trusted"
       - run: python -m pip install packaging
       - run: pip install setuptools
-      - run: nvm install v22.19.0
-      - run: nvm use v22.19.0
+      - run: nvm install v24.15.0
+      - run: nvm use v24.15.0
       - run: node -v
       - run: npm install --global npm@8 node-gyp
       - run: npm -v
@@ -175,7 +175,7 @@ jobs:
               -FileDigest 'SHA256' `
               -Files $dummyExePath
       # Package
-      - run: if [ -z "$CIRCLE_PR_NUMBER" ]; then yarn package; else echo "Forked repo; no package built."; fi
+      - run: if [ -z "$CIRCLE_PR_NUMBER" ]; then yarn package; yarn av-check; else echo "Forked repo; no package built."; fi
       - run: if [ -n "$CIRCLE_TAG" ]; then yarn av-whitelist; else echo "Not a tagged release."; fi
 
 # runs build for all branches and all tags starting with v.

.nvmrc

@@ -1 +1 @@
-22.19.0
+24.15.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22.19.0-alpine as base
+FROM node:24.11.1-alpine as base
 WORKDIR /app
 RUN mkdir -p dist node_modules .yarn-cache && chown -R node:node .
 

app/components/Upload.js

@@ -31,6 +31,7 @@ import debugMode from '../utils/debugMode.js';
 import uploadDataPeriod from '../utils/uploadDataPeriod.js';
 
 import { VerioBLE } from '../../lib/drivers/onetouch/oneTouchVerioBLE';
+import { KetoMojo } from '../../lib/drivers/vivachek/ketomojo';
 
 import * as styles from '../../styles/components/Upload.module.less';
 import env from '../utils/env.js';
@@ -44,6 +45,7 @@ import { i18n } from '../utils/config.i18next.cjs';
 const MEDTRONIC_KEYTAR_SERVICE = 'org.tidepool.uploader.medtronic.serialnumber';
 const ble = new BLE();
 const verioBLE = new VerioBLE();
+const ketoMojo = new KetoMojo();
 
 export default class Upload extends Component {
   static propTypes = {
@@ -97,7 +99,7 @@ export default class Upload extends Component {
     super(props);
     this.ble = ble;
     this.verioBLE = verioBLE;
-
+    this.ketoMojo = ketoMojo;
     this.populateRememberedSerialNumber();
   }
 
@@ -168,6 +170,8 @@ export default class Upload extends Component {
 
     if (device === 'onetouchverioble') {
       options.ble = this.verioBLE;
+    } else if (device === 'ketomojo') {
+      options.ble = this.ketoMojo;
     } else {
       options.ble = this.ble;
     }
@@ -212,7 +216,12 @@ export default class Upload extends Component {
       return this.handleMedtronic600Upload();
     }
 
-    if (device === 'caresensble' || device === 'onetouchverioble' || device === 'foracareble' || device === 'relionplatinumble') {
+    if (device === 'caresensble' ||
+        device === 'onetouchverioble' ||
+        device === 'foracareble' ||
+        device === 'relionplatinumble' ||
+        device === 'ketomojo'
+    ) {
       return this.handleBluetoothUpload(_.get(upload, 'key', null));
     }
 

app/main.dev.js

@@ -6,7 +6,7 @@ import osName from 'os-name';
 import * as chromeFinder from 'chrome-launcher/dist/chrome-finder.js';
 import { createRequire } from 'module';
 import { fileURLToPath, pathToFileURL } from 'url';
-import Rollbar from 'rollbar/src/server/rollbar.js';
+import Rollbar from 'rollbar';
 import uploadDataPeriod from './utils/uploadDataPeriod.js';
 import { setLanguage, i18n } from './utils/config.i18next.cjs';
 import path from 'path';

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tidepool-uploader",
   "productName": "tidepool-uploader",
-  "version": "2.64.1",
+  "version": "2.66.0",
   "description": "Tidepool Project Universal Uploader",
   "main": "./main.prod.js",
   "author": {

app/reducers/devices.js

@@ -194,6 +194,13 @@ const devices = {
     enabled: {mac: true, win: true, linux: true},
     powerOnlyWarning: true,
   },
+  ketomojo: {
+    instructions: i18n.t('Turn meter on and check the Bluetooth icon is flashing'),
+    key: 'ketomojo',
+    name: 'Keto-Mojo GK+/GKI (Connect with Bluetooth)',
+    source: {type: 'device', driverId: 'KetoMojo'},
+    enabled: {mac: true, win: true, linux: true},
+  },
   medtronic: {
     instructions: i18n.t('Connect your Contour Next Link to your computer'),
     image: {
@@ -276,6 +283,13 @@ const devices = {
     source: {type: 'device', driverId: 'OneTouchUltra2'},
     enabled: {mac: true, win: true, linux: true}
   },
+  prodigyautocode: {
+    instructions: i18n.t('Plug in meter with mini-USB cable'),
+    name: 'Prodigy AutoCode',
+    key: 'prodigyautocode',
+    source: {type: 'device', driverId: 'ProdigyAutocode'},
+    enabled: {mac: true, win: true, linux: true}
+  },
   relionplatinum: {
     instructions: i18n.t('Plug in meter with micro-USB cable'),
     name: 'ReliOn Platinum (Connect with USB)',
@@ -332,6 +346,7 @@ if (navigator.userAgentData.platform === 'macOS') {
     linkText: i18n.t('EZSync002B cable'),
     link: 'https://purenitetech.com/product/ezsync002b/',
   };
+  devices.prodigyautocode.instructions = i18n.t('Plug in meter with mini-USB cable. V6 meter not compatible with MacOS.');
 }
 
 if (env.electron) {

app/utils/rollbar.js

@@ -1,5 +1,5 @@
 /* global  __VERSION_SHA__ */
-import Rollbar from 'rollbar/dist/rollbar.umd.js';
+import Rollbar from 'rollbar';
 
 let rollbar;