@tryvital/vital-devices-react-native 0.2.6 → 0.3.0

package/ios/VitalDevicesReactNative-Bridging-Header.h

@@ -1,2 +1,3 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
+#import <React/RCTEventEmitter.h>

package/ios/VitalDevicesReactNative.m

@@ -1,10 +1,29 @@
 #import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
 
 @interface RCT_EXTERN_MODULE(VitalDevicesReactNative, NSObject)
 
-RCT_EXTERN_METHOD(multiply:(float)a withB:(float)b
-                 withResolver:(RCTPromiseResolveBlock)resolve
-                 withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(startScanForDevice:(NSString *)id
+                  name:(NSString *)name
+                  brand:(NSString *)brand
+                  kind:(NSString *)kind
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(stopScanForDevice:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(pair:(NSString *)scannedDeviceId
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(startReadingBloodPressure:(NSString *)scannedDeviceId
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(startReadingGlucoseMeter:(NSString *)scannedDeviceId
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 
 + (BOOL)requiresMainQueueSetup
 {

package/ios/VitalDevicesReactNative.swift

@@ -1,8 +1,296 @@
+import UIKit
+import Combine
+import CoreBluetooth
+import CoreLocation
+import CombineCoreBluetooth
+import VitalCore
+import VitalDevices
+
 @objc(VitalDevicesReactNative)
-class VitalDevicesReactNative: NSObject {
+class VitalDevicesReactNative: RCTEventEmitter {
+
+    private lazy var deviceManager = DevicesManager()
+
+    private var glucoseMeterCancellable: Cancellable? = nil
+    private var bloodPressureCancellable: Cancellable? = nil
+    private var pairCancellable: Cancellable? = nil
+
+    private var scannerResultCancellable: Cancellable? = nil
+    private var scannedDevices: [ScannedDevice] = []
+
+    deinit {
+        scannerResultCancellable?.cancel()
+        glucoseMeterCancellable?.cancel()
+        bloodPressureCancellable?.cancel()
+        pairCancellable?.cancel()
+    }
+
+    @objc(startScanForDevice:name:brand:kind:resolver:rejecter:)
+    func startScanForDevice(_ id:String,
+                            name: String,
+                            brand: String,
+                            kind: String,
+                            resolve: @escaping RCTPromiseResolveBlock,
+                            reject:RCTPromiseRejectBlock) -> Void {
+        do {
+            let deviceModel = DeviceModel(
+                id: id,
+                name: name,
+                brand: try mapStringToBrand(brand),
+                kind: try mapStringToKind(kind)
+            )
+
+            scannerResultCancellable?.cancel()
+            scannerResultCancellable =  deviceManager.search(for:deviceModel)
+                .sink {[weak self] value in
+                    self?.scannedDevices.append(value)
+                    self?.sendEvent(withName: "ScanEvent", body:
+                                        [
+                                            "id": value.id.uuidString,
+                                            "name": value.name,
+                                            "deviceModel": [
+                                                "id": value.deviceModel.id,
+                                                "name": value.deviceModel.name,
+                                                "brand": value.deviceModel.brand.rawValue,
+                                                "kind": value.deviceModel.kind.rawValue
+                                            ]
+                                        ])
+                }
+
+            resolve(())
+        } catch VitalError.UnsupportedBrand(let errorMessage) {
+            resolve(["error": "UnsupportedBrand", "message": errorMessage])
+        } catch VitalError.UnsupportedKind(let errorMessage) {
+            resolve(["error": "UnsupportedKind", "message": errorMessage])
+        } catch {
+            resolve(["error": "Unknown", "message": error.localizedDescription])
+        }
+    }
+
+    @objc(stopScanForDevice:rejecter:)
+    func stopScanForDevice(_ resolve: @escaping RCTPromiseResolveBlock,
+                           reject:RCTPromiseRejectBlock) -> Void {
+        scannerResultCancellable?.cancel()
+        resolve(())
+    }
+
+    @objc(pair:resolver:rejecter:)
+    func pair(_ scannedDeviceId:String,
+              resolve: @escaping RCTPromiseResolveBlock,
+              reject:RCTPromiseRejectBlock) -> Void {
+        let scannedDevice = scannedDevices.first(where: { $0.id == UUID(uuidString:scannedDeviceId) })
+
+        guard scannedDevice != nil else {
+            resolve([
+                "error": "DeviceNotFound",
+                "message": "Device not found with id \(scannedDeviceId)"
+            ])
+            return
+        }
+
+        pairCancellable?.cancel()
+        switch scannedDevice!.deviceModel.kind{
+        case .glucoseMeter:
+            pairCancellable = deviceManager
+                .glucoseMeter(for: scannedDevice!)
+                .pair(device: scannedDevice!)
+                .sink(receiveCompletion: {[weak self] value in
+                    self?.handlePairCompletion(value: value )
+                },
+                      receiveValue:{[weak self] value in
+                    self?.handlePairValue()
+                })
+        case .bloodPressure:
+            pairCancellable = deviceManager
+                .bloodPressureReader(for: scannedDevice!)
+                .pair(device: scannedDevice!)
+                .sink(receiveCompletion: {[weak self] value in
+                    self?.handlePairCompletion(value: value )
+                },
+                      receiveValue:{[weak self] value in
+                    self?.handlePairValue()
+                })
+        }
+        resolve(())
+    }
+
+    private func handlePairCompletion(value: Subscribers.Completion<any Error>){
+        switch value {
+        case .failure(let error):  self.sendEvent(withName: "PairEvent", body: ["error": "PairError", "message": error.localizedDescription])
+        case .finished:  self.sendEvent(withName: "PairEvent", body: true)
+        }
+    }
+
+    private func handlePairValue() {
+        self.sendEvent(withName: "PairEvent", body: true)
+    }
+
+    @objc(startReadingGlucoseMeter:resolver:rejecter:)
+    func startReadingGlucoseMeter(_ scannedDeviceId:String,
+                                  resolve: @escaping RCTPromiseResolveBlock,
+                                  reject:RCTPromiseRejectBlock) -> Void {
+
+        let scannedDeviceId = UUID(uuidString: scannedDeviceId)!
+        let scannedDevice = scannedDevices.first(where: { $0.id == scannedDeviceId })
+
+
+        guard scannedDevice != nil else {
+            resolve([
+                "error": "DeviceNotFound",
+                "message": "Device not found with id \(scannedDeviceId)"
+            ])
+            return
+        }
+
+        glucoseMeterCancellable?.cancel()
+        glucoseMeterCancellable =  deviceManager.glucoseMeter(for :scannedDevice!)
+            .read(device: scannedDevice!)
+            .sink (receiveCompletion: {[weak self] value in
+                self?.sendEvent(withName: "GlucoseMeterReadEvent", body: ["error": "ReadError", "message": "error reading data from device \(value)"])
+            }, receiveValue:{[weak self] value in
+            self?.sendEvent(withName: "GlucoseMeterReadEvent", body: [
+                                "samples": value.map({[
+                                        "id": $0.id,
+                                        "value": $0.value,
+                                        "unit": $0.unit,
+                                        "startDate": $0.startDate.timeIntervalSince1970,
+                                        "endDate": $0.endDate.timeIntervalSince1970,
+                                        "type": $0.type
+                                ]})
+                            ] )
+            })
+
+        resolve(())
+    }
+
+    @objc(startReadingBloodPressure:resolver:rejecter:)
+    func startReadingBloodPressure(_ scannedDeviceId:String,
+                                   resolve: @escaping RCTPromiseResolveBlock,
+                                   reject:RCTPromiseRejectBlock) -> Void {
+        let scannedDeviceId = UUID(uuidString: scannedDeviceId)!
+        let scannedDevice = scannedDevices.first(where: { $0.id == scannedDeviceId })
+
+        guard scannedDevice != nil else {
+            resolve([
+                "error": "DeviceNotFound",
+                "message": "Device not found with id \(scannedDeviceId)"
+            ])
+            return
+        }
 
-  @objc(multiply:withB:withResolver:withRejecter:)
-  func multiply(a: Float, b: Float, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) -> Void {
-    resolve(a*b)
+        bloodPressureCancellable?.cancel()
+        bloodPressureCancellable = deviceManager.bloodPressureReader(for :scannedDevice!)
+            .read(device: scannedDevice!)
+            .sink (receiveCompletion: {[weak self] value in
+                self?.sendEvent(withName: "BloodPressureReadEvent", body: ["error": "ReadError", "message": "error reading data from device \(value)"])
+            }, receiveValue:{[weak self] value in
+                self?.sendEvent(withName: "BloodPressureReadEvent", body:[
+                    "samples": value.map({[
+                        "systolic": [
+                            "id": $0.systolic.id,
+                            "value": $0.systolic.value,
+                            "unit": $0.systolic.unit,
+                            "startDate": $0.systolic.startDate.timeIntervalSince1970,
+                            "endDate": $0.systolic.endDate.timeIntervalSince1970,
+                            "type": $0.systolic.type
+                        ],
+                        "diastolic": [
+                            "id": $0.diastolic.id,
+                            "value": $0.diastolic.value,
+                            "unit": $0.diastolic.unit,
+                            "startDate": $0.diastolic.startDate.timeIntervalSince1970,
+                            "endDate": $0.diastolic.endDate.timeIntervalSince1970,
+                            "type": $0.diastolic.type
+                        ],
+                        "pulse": [
+                            "id": $0.pulse?.id,
+                            "value": $0.pulse?.value,
+                            "unit": $0.pulse?.unit,
+                            "startDate": $0.pulse?.startDate.timeIntervalSince1970,
+                            "endDate": $0.pulse?.endDate.timeIntervalSince1970,
+                            "type": $0.pulse?.type
+                        ]
+                    ]})
+                ] )
+            })
+
+        resolve(())
+    }
+
+    override func supportedEvents() -> [String]! {
+        return ["ScanEvent","PairEvent","GlucoseMeterReadEvent","BloodPressureReadEvent"]
+    }
+}
+
+private func mapStringToBrand(_ brandId: String) throws -> Brand  {
+    switch brandId {
+        case "omron": return Brand.omron
+        case "accuChek": return Brand.accuChek
+        case "contour": return Brand.contour
+        case "beurer": return Brand.beurer
+        case "libre": return Brand.libre
+        default: throw VitalError.UnsupportedBrand(brandId)
+    }
+}
+
+private func mapStringToKind(_ kindId: String) throws -> DeviceModel.Kind  {
+    switch kindId {
+    case "bloodPressure": return DeviceModel.Kind.bloodPressure
+    case "glucoseMeter": return DeviceModel.Kind.glucoseMeter
+    default: throw VitalError.UnsupportedKind(kindId)
+    }
+}
+
+private func mapBrandToString(_ brand: Brand) -> String {
+    switch brand {
+    case .omron: return "omron"
+    case .accuChek: return "accuChek"
+    case .contour: return "contour"
+    case .beurer: return "beurer"
+    case .libre: return "libre"
+    }
+}
+
+public struct InternalScannedDevice: Equatable, Encodable {
+  public let id: String
+  public let name: String
+  public let deviceModel: DeviceModel
+
+  init(
+    id: String,
+    name: String,
+    deviceModel: DeviceModel
+  ) {
+    self.id = id
+    self.name = name
+    self.deviceModel = deviceModel
   }
 }
+
+struct AnyEncodable: Encodable {
+  let value: Encodable
+
+  func encode(to encoder: Encoder) throws {
+    try value.encode(to: encoder)
+  }
+}
+
+struct ErrorResult: Encodable {
+  let code: String
+  let message: String?
+
+  init(code: String, message: String? = nil){
+    self.code = code
+    self.message = message
+  }
+}
+
+enum VitalError: Error {
+  case UnsupportedRegion(String)
+  case UnsupportedEnvironment(String)
+  case UnsupportedResource(String)
+  case UnsupportedDataPushMode(String)
+  case UnsupportedProvider(String)
+  case UnsupportedBrand(String)
+  case UnsupportedKind(String)
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryvital/vital-devices-react-native",
-  "version": "0.2.6",
+  "version": "0.3.0",
   "description": "Client to access Vital's Endpoints",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -28,7 +28,6 @@
     "postversion": "react-native-version",
     "test": "jest",
     "typescript": "tsc --declaration",
-    "postinstall": "npm run typescript",
     "lint": "eslint \"**/*.{js,ts,tsx}\"",
     "release": "release-it",
     "example": "yarn --cwd example",
@@ -52,6 +51,10 @@
   "dependencies": {
     "react-native-permissions": "^3.6.1"
   },
+  "peerDependencies": {
+    "react": "*",
+    "react-native": "*"
+  },
   "devDependencies": {
     "@arkweid/lefthook": "^0.7.7",
     "@commitlint/config-conventional": "^17.0.2",

package/src/index.ts

@@ -1,8 +1,8 @@
 import type { DeviceModel } from './model/device_model';
+import { DeviceKind } from './model/device_model';
 import { NativeModules, Platform } from 'react-native';
 import { checkMultiple, PERMISSIONS } from 'react-native-permissions';
 import { Brand } from './model/brand';
-import { DeviceKind } from './model/device_model';
 
 const LINKING_ERROR =
   `The package 'vital-core-react-native' doesn't seem to be linked. Make sure: \n\n` +
@@ -24,10 +24,10 @@ const VitalDevicesReactNative = NativeModules.VitalDevicesReactNative
 export const VitalDevicesNativeModule = VitalDevicesReactNative;
 
 export const VitalDevicesEvents = {
-  scanEvent: VitalDevicesNativeModule.ScanEvent,
-  pairEvent: VitalDevicesNativeModule.PairEvent,
-  glucoseMeterReadEvent: VitalDevicesNativeModule.GlucoseMeterReadEvent,
-  bloodPressureReadEvent: VitalDevicesNativeModule.BloodPressureReadEvent,
+  scanEvent: 'ScanEvent',
+  pairEvent: 'PairEvent',
+  glucoseMeterReadEvent: 'GlucoseMeterReadEvent',
+  bloodPressureReadEvent: 'BloodPressureReadEvent',
 };
 
 export class VitalDevicesManager {
@@ -69,17 +69,29 @@ export class VitalDevicesManager {
   }
 
   private async checkPermission() {
-    const result = await checkMultiple([
-      PERMISSIONS.ANDROID.BLUETOOTH_SCAN,
-      PERMISSIONS.ANDROID.BLUETOOTH_CONNECT,
-    ]);
-
-    if (result[PERMISSIONS.ANDROID.BLUETOOTH_SCAN] !== 'granted') {
-      throw new Error('Bluetooth scan permission is not granted');
-    }
+    if (Platform.OS === 'ios') {
+      const result = await checkMultiple([
+        PERMISSIONS.IOS.BLUETOOTH_PERIPHERAL,
+      ]);
+
+      if (result[PERMISSIONS.IOS.BLUETOOTH_PERIPHERAL] !== 'granted') {
+        throw new Error(
+          'Bluetooth permission is not granted. Please check your settings.'
+        );
+      }
+    } else {
+      const result = await checkMultiple([
+        PERMISSIONS.ANDROID.BLUETOOTH_SCAN,
+        PERMISSIONS.ANDROID.BLUETOOTH_CONNECT,
+      ]);
+
+      if (result[PERMISSIONS.ANDROID.BLUETOOTH_SCAN] !== 'granted') {
+        throw new Error('Bluetooth scan permission is not granted');
+      }
 
-    if (result[PERMISSIONS.ANDROID.BLUETOOTH_CONNECT] !== 'granted') {
-      throw new Error('Bluetooth connect permission is not granted');
+      if (result[PERMISSIONS.ANDROID.BLUETOOTH_CONNECT] !== 'granted') {
+        throw new Error('Bluetooth connect permission is not granted');
+      }
     }
   }
 

package/vital-devices-react-native.podspec

@@ -17,6 +17,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.dependency "React-Core"
+  s.dependency "VitalDevices", "~> 0.7.11"
 
   # Don't install the dependencies when we run `pod install` in the old architecture.
   if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then

package/lib/index.d.ts

@@ -1,25 +0,0 @@
-import type { DeviceModel } from './model/device_model';
-import { Brand } from './model/brand';
-import { DeviceKind } from './model/device_model';
-export declare const VitalDevicesNativeModule: any;
-export declare const VitalDevicesEvents: {
-    scanEvent: any;
-    pairEvent: any;
-    glucoseMeterReadEvent: any;
-    bloodPressureReadEvent: any;
-};
-export declare class VitalDevicesManager {
-    scanForDevice(deviceModel: DeviceModel): Promise<any>;
-    stopScan(): Promise<any>;
-    pairDevice(scannedDeviceId: string): Promise<any>;
-    readBloodPressure(scannedDeviceId: string): Promise<any>;
-    readGlucoseMeter(scannedDeviceId: string): Promise<any>;
-    private checkPermission;
-    static brands: Brand[];
-    static supportedDevices: {
-        id: string;
-        name: string;
-        brand: Brand;
-        kind: DeviceKind;
-    }[];
-}

package/lib/index.js

@@ -1,112 +0,0 @@
-import { NativeModules, Platform } from 'react-native';
-import { checkMultiple, PERMISSIONS } from 'react-native-permissions';
-import { Brand } from './model/brand';
-import { DeviceKind } from './model/device_model';
-const LINKING_ERROR = `The package 'vital-core-react-native' doesn't seem to be linked. Make sure: \n\n` +
-    Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) +
-    '- You rebuilt the app after installing the package\n' +
-    '- You are not using Expo Go\n';
-const VitalDevicesReactNative = NativeModules.VitalDevicesReactNative
-    ? NativeModules.VitalDevicesReactNative
-    : new Proxy({}, {
-        get() {
-            throw new Error(LINKING_ERROR);
-        },
-    });
-export const VitalDevicesNativeModule = VitalDevicesReactNative;
-export const VitalDevicesEvents = {
-    scanEvent: VitalDevicesNativeModule.ScanEvent,
-    pairEvent: VitalDevicesNativeModule.PairEvent,
-    glucoseMeterReadEvent: VitalDevicesNativeModule.GlucoseMeterReadEvent,
-    bloodPressureReadEvent: VitalDevicesNativeModule.BloodPressureReadEvent,
-};
-export class VitalDevicesManager {
-    async scanForDevice(deviceModel) {
-        await this.checkPermission();
-        return NativeModules.VitalDevicesReactNative.startScanForDevice(deviceModel.id, deviceModel.name, deviceModel.brand, deviceModel.kind);
-    }
-    async stopScan() {
-        return NativeModules.VitalDevicesReactNative.stopScanForDevice();
-    }
-    async pairDevice(scannedDeviceId) {
-        await this.checkPermission();
-        return NativeModules.VitalDevicesReactNative.pair(scannedDeviceId);
-    }
-    async readBloodPressure(scannedDeviceId) {
-        await this.checkPermission();
-        return NativeModules.VitalDevicesReactNative.startReadingBloodPressure(scannedDeviceId);
-    }
-    async readGlucoseMeter(scannedDeviceId) {
-        await this.checkPermission();
-        return NativeModules.VitalDevicesReactNative.startReadingGlucoseMeter(scannedDeviceId);
-    }
-    async checkPermission() {
-        const result = await checkMultiple([
-            PERMISSIONS.ANDROID.BLUETOOTH_SCAN,
-            PERMISSIONS.ANDROID.BLUETOOTH_CONNECT,
-        ]);
-        if (result[PERMISSIONS.ANDROID.BLUETOOTH_SCAN] !== 'granted') {
-            throw new Error('Bluetooth scan permission is not granted');
-        }
-        if (result[PERMISSIONS.ANDROID.BLUETOOTH_CONNECT] !== 'granted') {
-            throw new Error('Bluetooth connect permission is not granted');
-        }
-    }
-    static brands = [
-        Brand.Omron,
-        Brand.AccuChek,
-        Brand.Contour,
-        Brand.Beurer,
-        Brand.Libre,
-    ];
-    static supportedDevices = [
-        {
-            id: 'omron_m4',
-            name: 'Omron Intelli IT M4',
-            brand: Brand.Omron,
-            kind: DeviceKind.BloodPressure,
-        },
-        {
-            id: 'omron_m7',
-            name: 'Omron Intelli IT M7',
-            brand: Brand.Omron,
-            kind: DeviceKind.BloodPressure,
-        },
-        {
-            id: 'accuchek_guide',
-            name: 'Accu-Chek Guide',
-            brand: Brand.AccuChek,
-            kind: DeviceKind.GlucoseMeter,
-        },
-        {
-            id: 'accuchek_guide_me',
-            name: 'Accu-Chek Guide Me',
-            brand: Brand.AccuChek,
-            kind: DeviceKind.GlucoseMeter,
-        },
-        {
-            id: 'accuchek_guide_active',
-            name: 'Accu-Chek Active',
-            brand: Brand.AccuChek,
-            kind: DeviceKind.GlucoseMeter,
-        },
-        {
-            id: 'contour_next_one',
-            name: 'Contour Next One',
-            brand: Brand.Contour,
-            kind: DeviceKind.GlucoseMeter,
-        },
-        {
-            id: 'beurer',
-            name: 'Beurer Devices',
-            brand: Brand.Beurer,
-            kind: DeviceKind.BloodPressure,
-        },
-        {
-            id: 'libre1',
-            name: 'Freestyle Libre 1',
-            brand: Brand.Libre,
-            kind: DeviceKind.GlucoseMeter,
-        },
-    ];
-}

package/lib/model/brand.d.ts

@@ -1,7 +0,0 @@
-export declare enum Brand {
-    Omron = "omron",
-    AccuChek = "accuChek",
-    Contour = "contour",
-    Beurer = "beurer",
-    Libre = "libre"
-}

package/lib/model/brand.js

@@ -1,8 +0,0 @@
-export var Brand;
-(function (Brand) {
-    Brand["Omron"] = "omron";
-    Brand["AccuChek"] = "accuChek";
-    Brand["Contour"] = "contour";
-    Brand["Beurer"] = "beurer";
-    Brand["Libre"] = "libre";
-})(Brand || (Brand = {}));

package/lib/model/device_model.d.ts

@@ -1,11 +0,0 @@
-import type { Brand } from './brand';
-export declare enum DeviceKind {
-    BloodPressure = "bloodPressure",
-    GlucoseMeter = "glucoseMeter"
-}
-export interface DeviceModel {
-    id: string;
-    name: string;
-    brand: Brand;
-    kind: DeviceKind;
-}

package/lib/model/device_model.js

@@ -1,5 +0,0 @@
-export var DeviceKind;
-(function (DeviceKind) {
-    DeviceKind["BloodPressure"] = "bloodPressure";
-    DeviceKind["GlucoseMeter"] = "glucoseMeter";
-})(DeviceKind || (DeviceKind = {}));

package/lib/model/scanned_device.d.ts

@@ -1,6 +0,0 @@
-import type { DeviceModel } from './device_model';
-export interface ScannedDevice {
-    id: string;
-    name: string;
-    deviceModel: DeviceModel;
-}

package/lib/model/scanned_device.js

@@ -1 +0,0 @@
-export {};