@neurosity/sdk 6.4.0-next.0 → 6.4.0

package/dist/esm/Neurosity.d.ts

@@ -80,6 +80,11 @@ export declare class Neurosity {
      * @hidden
      */
     _initStreamingMode(streamingMode: STREAMING_MODE, hasBluetoothTransport: boolean): void;
+    /**
+     *
+     * @hidden
+     */
+    _osHasBluetoothSupport(): Observable<any>;
     /**
      * Subscribe to the device's streaming state changes and the current strategy
      *

package/dist/esm/Neurosity.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { combineLatest, of, throwError } from "rxjs";
 import { ReplaySubject, firstValueFrom, EMPTY } from "rxjs";
-import { distinctUntilChanged, map, switchMap } from "rxjs/operators";
-import { combineLatestWith } from "rxjs/operators";
+import { map, startWith, switchMap } from "rxjs/operators";
+import { distinctUntilChanged } from "rxjs/operators";
 import isEqual from "fast-deep-equal";
 import { CloudClient, createUser } from "./api/index";
 import { credentialWithLink, SERVER_TIMESTAMP } from "./api/index";
@@ -71,7 +71,7 @@ export class Neurosity {
         if (!!bluetoothTransport) {
             this.bluetoothClient = new BluetoothClient({
                 selectedDevice$: this.onDeviceChange(),
-                osVersion$: this.osVersion(),
+                osHasBluetoothSupport$: this._osHasBluetoothSupport(),
                 createBluetoothToken: this.createBluetoothToken.bind(this),
                 transport: bluetoothTransport
             });
@@ -102,6 +102,16 @@ export class Neurosity {
             this.streamingMode$.next(streamingMode);
         }
     }
+    /**
+     *
+     * @hidden
+     */
+    _osHasBluetoothSupport() {
+        return combineLatest({
+            selectedDevice: this.onDeviceChange(),
+            osVersion: this.osVersion().pipe(startWith(null))
+        }).pipe(map(({ selectedDevice, osVersion }) => osHasBluetoothSupport(selectedDevice, osVersion)));
+    }
     /**
      * Subscribe to the device's streaming state changes and the current strategy
      *
@@ -117,12 +127,14 @@ export class Neurosity {
     streamingState() {
         const isWifiOnline = (state) => [STATUS.ONLINE, STATUS.UPDATING].includes(state);
         return this.streamingMode$.pipe(switchMap((streamingMode) => {
-            return this.onDeviceChange().pipe(combineLatestWith(this.osVersion()), switchMap(([selectDevice, osVersion]) => {
-                if (!selectDevice) {
+            return combineLatest({
+                selectedDevice: this.onDeviceChange(),
+                osHasBluetoothSupport: this._osHasBluetoothSupport()
+            }).pipe(switchMap(({ selectedDevice, osHasBluetoothSupport }) => {
+                if (!selectedDevice) {
                     return EMPTY;
                 }
-                const isUnableToUseBluetooth = this.isMissingBluetoothTransport ||
-                    !osHasBluetoothSupport(selectDevice, osVersion);
+                const isUnableToUseBluetooth = this.isMissingBluetoothTransport || !osHasBluetoothSupport;
                 if (isUnableToUseBluetooth) {
                     return this.cloudClient.status().pipe(map(({ state }) => ({
                         connected: isWifiOnline(state),

package/dist/esm/api/bluetooth/BluetoothClient.d.ts

@@ -2,7 +2,7 @@ import { Observable } from "rxjs";
 import { ReplaySubject } from "rxjs";
 import { WebBluetoothTransport } from "./web/WebBluetoothTransport";
 import { ReactNativeTransport } from "./react-native/ReactNativeTransport";
-import { DeviceInfo, OSVersion } from "../../types/deviceInfo";
+import { DeviceInfo } from "../../types/deviceInfo";
 import { Action } from "../../types/actions";
 import { Epoch } from "../../types/epoch";
 import { BLUETOOTH_CONNECTION } from "./types";
@@ -16,14 +16,14 @@ declare type CreateBluetoothToken = () => Promise<string>;
 declare type Options = {
     transport: BluetoothTransport;
     selectedDevice$: Observable<DeviceInfo>;
-    osVersion$: Observable<OSVersion>;
+    osHasBluetoothSupport$: Observable<boolean>;
     createBluetoothToken: CreateBluetoothToken;
 };
 export declare class BluetoothClient {
     transport: BluetoothTransport;
     deviceInfo: DeviceInfo;
     selectedDevice$: ReplaySubject<DeviceInfo>;
-    osVersion$: ReplaySubject<string>;
+    osHasBluetoothSupport$: ReplaySubject<boolean>;
     isAuthenticated$: ReplaySubject<boolean>;
     _focus$: Observable<any>;
     _calm$: Observable<any>;

package/dist/esm/api/bluetooth/BluetoothClient.js

@@ -7,21 +7,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { defer, firstValueFrom, timer } from "rxjs";
-import { ReplaySubject, EMPTY } from "rxjs";
-import { switchMap, share, tap, combineLatestWith } from "rxjs/operators";
-import { distinctUntilChanged } from "rxjs/operators";
+import { defer, timer } from "rxjs";
+import { ReplaySubject, firstValueFrom, EMPTY } from "rxjs";
+import { switchMap, share, tap, distinctUntilChanged } from "rxjs/operators";
 import { WebBluetoothTransport } from "./web/WebBluetoothTransport";
 import { ReactNativeTransport } from "./react-native/ReactNativeTransport";
 import { csvBufferToEpoch } from "./utils/csvBufferToEpoch";
 import { BLUETOOTH_CONNECTION } from "./types";
-import { osHasBluetoothSupport } from "./utils/osHasBluetoothSupport";
 export class BluetoothClient {
     constructor(options) {
         this.selectedDevice$ = new ReplaySubject(1);
-        this.osVersion$ = new ReplaySubject(1);
+        this.osHasBluetoothSupport$ = new ReplaySubject(1);
         this.isAuthenticated$ = new ReplaySubject(1);
-        const { transport, selectedDevice$, createBluetoothToken } = options !== null && options !== void 0 ? options : {};
+        const { transport, selectedDevice$, osHasBluetoothSupport$, createBluetoothToken } = options !== null && options !== void 0 ? options : {};
         if (!transport) {
             throw new Error(`No bluetooth transport provided.`);
         }
@@ -30,9 +28,14 @@ export class BluetoothClient {
         if (selectedDevice$) {
             selectedDevice$.subscribe(this.selectedDevice$);
         }
-        // Auto Connect
-        this.transport
-            ._autoConnect(this.selectedDevice$, this.osVersion$)
+        // Pass events to the internal osHasBluetoothSupport$ if osHasBluetoothSupport$ is passed via options
+        if (osHasBluetoothSupport$) {
+            osHasBluetoothSupport$.subscribe(this.osHasBluetoothSupport$);
+        }
+        this.osHasBluetoothSupport$
+            .pipe(switchMap((osHasBluetoothSupport) => osHasBluetoothSupport
+            ? this.transport._autoConnect(this.selectedDevice$)
+            : EMPTY))
             .subscribe({
             error: (error) => {
                 var _a;
@@ -48,7 +51,11 @@ export class BluetoothClient {
             this.transport.addLog("Auto authentication not enabled");
         }
         // Auto manage action notifications
-        this.transport._autoToggleActionNotifications(this.selectedDevice$, this.osVersion$);
+        this.osHasBluetoothSupport$
+            .pipe(switchMap((osHasBluetoothSupport) => osHasBluetoothSupport
+            ? this.transport._autoToggleActionNotifications()
+            : EMPTY))
+            .subscribe();
         // Multicast metrics (share)
         this._focus$ = this._subscribeWhileAuthenticated("focus");
         this._calm$ = this._subscribeWhileAuthenticated("calm");
@@ -72,28 +79,24 @@ export class BluetoothClient {
         const reauthenticateInterval$ = timer(0, REAUTHENTICATE_INTERVAL).pipe(tap(() => {
             this.transport.addLog(`Auto authentication in progress...`);
         }));
-        return this.selectedDevice$.pipe(combineLatestWith(this.osVersion$), switchMap(([selectedDevice, osVersion]) => !osHasBluetoothSupport(selectedDevice, osVersion)
-            ? EMPTY
-            : this.connection().pipe(switchMap((connection) => connection === BLUETOOTH_CONNECTION.CONNECTED
-                ? reauthenticateInterval$
-                : EMPTY), switchMap(() => __awaiter(this, void 0, void 0, function* () { return yield this.isAuthenticated(); })), tap(([isAuthenticated]) => __awaiter(this, void 0, void 0, function* () {
-                if (!isAuthenticated) {
-                    const token = yield createBluetoothToken();
-                    yield this.authenticate(token);
-                }
-                else {
-                    this.transport.addLog(`Already authenticated`);
-                }
-            })))));
+        return this.osHasBluetoothSupport$.pipe(switchMap((osHasBluetoothSupport) => osHasBluetoothSupport ? this.connection() : EMPTY), switchMap((connection) => connection === BLUETOOTH_CONNECTION.CONNECTED
+            ? reauthenticateInterval$
+            : EMPTY), switchMap(() => __awaiter(this, void 0, void 0, function* () { return yield this.isAuthenticated(); })), tap(([isAuthenticated]) => __awaiter(this, void 0, void 0, function* () {
+            if (!isAuthenticated) {
+                const token = yield createBluetoothToken();
+                yield this.authenticate(token);
+            }
+            else {
+                this.transport.addLog(`Already authenticated`);
+            }
+        })));
     }
     enableAutoConnect(autoConnect) {
         this.transport.enableAutoConnect(autoConnect);
     }
     _hasBluetoothSupport() {
         return __awaiter(this, void 0, void 0, function* () {
-            const selectedDevice = yield firstValueFrom(this.selectedDevice$);
-            const osVersion = yield firstValueFrom(this.osVersion$);
-            return osHasBluetoothSupport(selectedDevice, osVersion);
+            return yield firstValueFrom(this.osHasBluetoothSupport$);
         });
     }
     authenticate(token) {
@@ -174,13 +177,11 @@ export class BluetoothClient {
         });
     }
     _subscribeWhileAuthenticated(characteristicName) {
-        return this.selectedDevice$.pipe(combineLatestWith(this.osVersion$), switchMap(([selectedDevice, osVersion]) => !osHasBluetoothSupport(selectedDevice, osVersion)
-            ? EMPTY
-            : this.isAuthenticated$.pipe(distinctUntilChanged(), switchMap((isAuthenticated) => isAuthenticated
-                ? this.transport.subscribeToCharacteristic({
-                    characteristicName
-                })
-                : EMPTY))), share());
+        return this.osHasBluetoothSupport$.pipe(switchMap((osHasBluetoothSupport) => osHasBluetoothSupport ? this.isAuthenticated$ : EMPTY), distinctUntilChanged(), switchMap((isAuthenticated) => isAuthenticated
+            ? this.transport.subscribeToCharacteristic({
+                characteristicName
+            })
+            : EMPTY), share());
     }
     focus() {
         return this._focus$;

package/dist/esm/api/bluetooth/react-native/ReactNativeTransport.d.ts

@@ -1,5 +1,4 @@
-import { BehaviorSubject, ReplaySubject } from "rxjs";
-import { Observable } from "rxjs";
+import { Observable, BehaviorSubject, ReplaySubject } from "rxjs";
 import { BluetoothTransport } from "../BluetoothTransport";
 import { ActionOptions, SubscribeOptions } from "../types";
 import { TRANSPORT_TYPE, BLUETOOTH_CONNECTION } from "../types";
@@ -7,7 +6,7 @@ import { BleManager } from "./types/BleManagerTypes";
 import { Peripheral } from "./types/BleManagerTypes";
 import { NativeEventEmitter } from "./types/ReactNativeTypes";
 import { PlatformOSType } from "./types/ReactNativeTypes";
-import { DeviceInfo, OSVersion } from "../../../types/deviceInfo";
+import { DeviceInfo } from "../../../types/deviceInfo";
 declare type Characteristic = {
     characteristicUUID: string;
     serviceUUID: string;
@@ -48,7 +47,7 @@ export declare class ReactNativeTransport implements BluetoothTransport {
     constructor(options: Options);
     addLog(log: string): void;
     isConnected(): boolean;
-    _autoConnect(selectedDevice$: Observable<DeviceInfo>, osVersion$: Observable<OSVersion>): Observable<void>;
+    _autoConnect(selectedDevice$: Observable<DeviceInfo>): Observable<void>;
     enableAutoConnect(autoConnect: boolean): void;
     connection(): Observable<BLUETOOTH_CONNECTION>;
     _fromEvent(eventName: string): Observable<any>;
@@ -65,7 +64,7 @@ export declare class ReactNativeTransport implements BluetoothTransport {
     writeCharacteristic(characteristicName: string, data: string): Promise<void>;
     _addPendingAction(actionId: number): void;
     _removePendingAction(actionId: number): void;
-    _autoToggleActionNotifications(selectedDevice$: Observable<DeviceInfo>, osVersion$: Observable<OSVersion>): Promise<void>;
+    _autoToggleActionNotifications(): Observable<any>;
     dispatchAction({ characteristicName, action }: ActionOptions): Promise<any>;
 }
 export {};

package/dist/esm/api/bluetooth/react-native/ReactNativeTransport.js

@@ -10,11 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { BLUETOOTH_PRIMARY_SERVICE_UUID_STRING } from "@neurosity/ipk";
 import { BLUETOOTH_CHUNK_DELIMITER } from "@neurosity/ipk";
 import { BLUETOOTH_DEVICE_NAME_PREFIXES } from "@neurosity/ipk";
-import { BehaviorSubject, defer, merge, of, ReplaySubject, timer } from "rxjs";
-import { fromEventPattern, Observable, NEVER, EMPTY } from "rxjs";
+import { Observable, BehaviorSubject, ReplaySubject, NEVER } from "rxjs";
+import { defer, merge, of, timer, fromEventPattern } from "rxjs";
 import { switchMap, map, filter, takeUntil, tap } from "rxjs/operators";
 import { shareReplay, distinctUntilChanged, finalize } from "rxjs/operators";
-import { take, share, scan, distinct, combineLatestWith } from "rxjs/operators";
+import { take, share, scan, distinct } from "rxjs/operators";
 import { create6DigitPin } from "../utils/create6DigitPin";
 import { stitchChunks } from "../utils/stitch";
 import { encode, decode } from "../utils/encoding";
@@ -23,7 +23,6 @@ import { DEFAULT_ACTION_RESPONSE_TIMEOUT } from "../constants";
 import { CHARACTERISTIC_UUIDS_TO_NAMES } from "../constants";
 import { ANDROID_MAX_MTU } from "../constants";
 import { REACT_NATIVE_MAX_BYTE_SIZE } from "../constants";
-import { osHasBluetoothSupport } from "../utils/osHasBluetoothSupport";
 const defaultOptions = {
     autoConnect: true
 };
@@ -101,16 +100,14 @@ export class ReactNativeTransport {
         const connection = this.connection$.getValue();
         return connection === BLUETOOTH_CONNECTION.CONNECTED;
     }
-    _autoConnect(selectedDevice$, osVersion$) {
+    _autoConnect(selectedDevice$) {
         const selectedDeviceAfterDisconnect$ = this.onDisconnected$.pipe(switchMap(() => selectedDevice$));
         return this._isAutoConnectEnabled$.pipe(switchMap((isAutoConnectEnabled) => isAutoConnectEnabled
             ? merge(selectedDevice$, selectedDeviceAfterDisconnect$)
-            : NEVER), combineLatestWith(osVersion$), switchMap(([selectedDevice, osVersion]) => !osHasBluetoothSupport(selectedDevice, osVersion)
-            ? NEVER
-            : this.scan().pipe(switchMap((peripherals) => {
-                const peripheralMatch = peripherals.find((peripheral) => peripheral.name === (selectedDevice === null || selectedDevice === void 0 ? void 0 : selectedDevice.deviceNickname));
-                return peripheralMatch ? of(peripheralMatch) : NEVER;
-            }), distinct((peripheral) => peripheral.id), take(1))), switchMap((peripheral) => __awaiter(this, void 0, void 0, function* () {
+            : NEVER), switchMap((selectedDevice) => this.scan().pipe(switchMap((peripherals) => {
+            const peripheralMatch = peripherals.find((peripheral) => peripheral.name === (selectedDevice === null || selectedDevice === void 0 ? void 0 : selectedDevice.deviceNickname));
+            return peripheralMatch ? of(peripheralMatch) : NEVER;
+        }), distinct((peripheral) => peripheral.id), take(1))), switchMap((peripheral) => __awaiter(this, void 0, void 0, function* () {
             return yield this.connect(peripheral);
         })));
     }
@@ -333,42 +330,35 @@ export class ReactNativeTransport {
         const actions = this.pendingActions$.getValue();
         this.pendingActions$.next(actions.filter((id) => id !== actionId));
     }
-    _autoToggleActionNotifications(selectedDevice$, osVersion$) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let started = false;
-            const sideEffects$ = this.connection$.asObservable().pipe(switchMap((connection) => connection === BLUETOOTH_CONNECTION.CONNECTED
-                ? this.pendingActions$
-                : NEVER), tap((pendingActions) => __awaiter(this, void 0, void 0, function* () {
-                var _a, _b;
-                const { peripheralId, serviceUUID, characteristicUUID } = this.getCharacteristicByName("actions");
-                const hasPendingActions = !!pendingActions.length;
-                if (hasPendingActions && !started) {
-                    started = true;
-                    try {
-                        yield this.BleManager.startNotification(peripheralId, serviceUUID, characteristicUUID);
-                        this.addLog(`Started notifications for [actions] characteristic`);
-                    }
-                    catch (error) {
-                        this.addLog(`Attemped to start notifications for [actions] characteristic: ${(_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error}`);
-                    }
+    _autoToggleActionNotifications() {
+        let started = false;
+        return this.connection$.asObservable().pipe(switchMap((connection) => connection === BLUETOOTH_CONNECTION.CONNECTED
+            ? this.pendingActions$
+            : NEVER), tap((pendingActions) => __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            const { peripheralId, serviceUUID, characteristicUUID } = this.getCharacteristicByName("actions");
+            const hasPendingActions = !!pendingActions.length;
+            if (hasPendingActions && !started) {
+                started = true;
+                try {
+                    yield this.BleManager.startNotification(peripheralId, serviceUUID, characteristicUUID);
+                    this.addLog(`Started notifications for [actions] characteristic`);
                 }
-                if (!hasPendingActions && started) {
-                    started = false;
-                    try {
-                        yield this.BleManager.stopNotification(peripheralId, serviceUUID, characteristicUUID);
-                        this.addLog(`Stopped notifications for actions characteristic`);
-                    }
-                    catch (error) {
-                        this.addLog(`Attemped to stop notifications for [actions] characteristic: ${(_b = error === null || error === void 0 ? void 0 : error.message) !== null && _b !== void 0 ? _b : error}`);
-                    }
+                catch (error) {
+                    this.addLog(`Attemped to start notifications for [actions] characteristic: ${(_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error}`);
                 }
-            })));
-            selectedDevice$
-                .pipe(combineLatestWith(osVersion$), switchMap(([selectedDevice, osVersion]) => !osHasBluetoothSupport(selectedDevice, osVersion)
-                ? EMPTY
-                : sideEffects$))
-                .subscribe();
-        });
+            }
+            if (!hasPendingActions && started) {
+                started = false;
+                try {
+                    yield this.BleManager.stopNotification(peripheralId, serviceUUID, characteristicUUID);
+                    this.addLog(`Stopped notifications for actions characteristic`);
+                }
+                catch (error) {
+                    this.addLog(`Attemped to stop notifications for [actions] characteristic: ${(_b = error === null || error === void 0 ? void 0 : error.message) !== null && _b !== void 0 ? _b : error}`);
+                }
+            }
+        })));
     }
     dispatchAction({ characteristicName, action }) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/esm/api/bluetooth/web/WebBluetoothTransport.d.ts

@@ -1,10 +1,9 @@
 /// <reference types="web-bluetooth" />
-import { BehaviorSubject, ReplaySubject } from "rxjs";
-import { Observable } from "rxjs";
+import { Observable, BehaviorSubject, ReplaySubject } from "rxjs";
 import { BluetoothTransport } from "../BluetoothTransport";
 import { ActionOptions, SubscribeOptions } from "../types";
 import { TRANSPORT_TYPE, BLUETOOTH_CONNECTION } from "../types";
-import { DeviceInfo, OSVersion } from "../../../types/deviceInfo";
+import { DeviceInfo } from "../../../types/deviceInfo";
 declare type Options = {
     autoConnect?: boolean;
 };
@@ -25,7 +24,7 @@ export declare class WebBluetoothTransport implements BluetoothTransport {
     _isAutoConnectEnabled$: ReplaySubject<boolean>;
     constructor(options?: Options);
     _getPairedDevices(): Promise<BluetoothDevice[]>;
-    _autoConnect(selectedDevice$: Observable<DeviceInfo>, osVersion$: Observable<OSVersion>): Observable<void>;
+    _autoConnect(selectedDevice$: Observable<DeviceInfo>): Observable<void>;
     enableAutoConnect(autoConnect: boolean): void;
     addLog(log: string): void;
     isConnected(): boolean;
@@ -48,7 +47,7 @@ export declare class WebBluetoothTransport implements BluetoothTransport {
     writeCharacteristic(characteristicName: string, data: string): Promise<void>;
     _addPendingAction(actionId: number): void;
     _removePendingAction(actionId: number): void;
-    _autoToggleActionNotifications(selectedDevice$: Observable<DeviceInfo>, osVersion$: Observable<OSVersion>): Promise<void>;
+    _autoToggleActionNotifications(): Observable<any>;
     dispatchAction({ characteristicName, action }: ActionOptions): Promise<any>;
 }
 export {};

package/dist/esm/api/bluetooth/web/WebBluetoothTransport.js

@@ -11,9 +11,9 @@ import { BLUETOOTH_PRIMARY_SERVICE_UUID_HEX } from "@neurosity/ipk";
 import { BLUETOOTH_CHUNK_DELIMITER } from "@neurosity/ipk";
 import { BLUETOOTH_DEVICE_NAME_PREFIXES } from "@neurosity/ipk";
 import { BLUETOOTH_COMPANY_IDENTIFIER_HEX } from "@neurosity/ipk";
-import { BehaviorSubject, defer, merge, of, ReplaySubject, timer } from "rxjs";
-import { fromEventPattern, Observable, EMPTY, NEVER } from "rxjs";
-import { switchMap, map, filter, tap, combineLatestWith } from "rxjs/operators";
+import { Observable, BehaviorSubject, ReplaySubject } from "rxjs";
+import { defer, merge, timer, fromEventPattern, NEVER } from "rxjs";
+import { switchMap, map, filter, tap } from "rxjs/operators";
 import { shareReplay, distinctUntilChanged } from "rxjs/operators";
 import { take, share } from "rxjs/operators";
 import { isWebBluetoothSupported } from "./isWebBluetoothSupported";
@@ -23,7 +23,6 @@ import { encode, decode } from "../utils/encoding";
 import { TRANSPORT_TYPE, BLUETOOTH_CONNECTION } from "../types";
 import { DEFAULT_ACTION_RESPONSE_TIMEOUT } from "../constants";
 import { CHARACTERISTIC_UUIDS_TO_NAMES } from "../constants";
-import { osHasBluetoothSupport } from "../utils/osHasBluetoothSupport";
 const defaultOptions = {
     autoConnect: true
 };
@@ -61,12 +60,10 @@ export class WebBluetoothTransport {
             return yield navigator.bluetooth.getDevices();
         });
     }
-    _autoConnect(selectedDevice$, osVersion$) {
+    _autoConnect(selectedDevice$) {
         return this._isAutoConnectEnabled$.pipe(switchMap((isAutoConnectEnabled) => isAutoConnectEnabled
             ? merge(selectedDevice$, this.onDisconnected$.pipe(switchMap(() => selectedDevice$)))
-            : NEVER), combineLatestWith(osVersion$), switchMap(([selectedDevice, osVersion]) => osHasBluetoothSupport(selectedDevice, osVersion)
-            ? of(selectedDevice)
-            : EMPTY), switchMap((selectedDevice) => __awaiter(this, void 0, void 0, function* () {
+            : NEVER), switchMap((selectedDevice) => __awaiter(this, void 0, void 0, function* () {
             var _a;
             const { deviceNickname } = selectedDevice;
             if (this.isConnected()) {
@@ -306,45 +303,38 @@ export class WebBluetoothTransport {
         const actions = this.pendingActions$.getValue();
         this.pendingActions$.next(actions.filter((id) => id !== actionId));
     }
-    _autoToggleActionNotifications(selectedDevice$, osVersion$) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let actionsCharacteristic;
-            let started = false;
-            const sideEffects$ = this.connection$.asObservable().pipe(switchMap((connection) => connection === BLUETOOTH_CONNECTION.CONNECTED
-                ? defer(() => this.getCharacteristicByName("actions")).pipe(switchMap((characteristic) => {
-                    actionsCharacteristic = characteristic;
-                    return this.pendingActions$;
-                }))
-                : NEVER), tap((pendingActions) => __awaiter(this, void 0, void 0, function* () {
-                var _a, _b;
-                const hasPendingActions = !!pendingActions.length;
-                if (hasPendingActions && !started) {
-                    started = true;
-                    try {
-                        yield actionsCharacteristic.startNotifications();
-                        this.addLog(`Started notifications for [actions] characteristic`);
-                    }
-                    catch (error) {
-                        this.addLog(`Attemped to start notifications for [actions] characteristic: ${(_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error}`);
-                    }
+    _autoToggleActionNotifications() {
+        let actionsCharacteristic;
+        let started = false;
+        return this.connection$.asObservable().pipe(switchMap((connection) => connection === BLUETOOTH_CONNECTION.CONNECTED
+            ? defer(() => this.getCharacteristicByName("actions")).pipe(switchMap((characteristic) => {
+                actionsCharacteristic = characteristic;
+                return this.pendingActions$;
+            }))
+            : NEVER), tap((pendingActions) => __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            const hasPendingActions = !!pendingActions.length;
+            if (hasPendingActions && !started) {
+                started = true;
+                try {
+                    yield actionsCharacteristic.startNotifications();
+                    this.addLog(`Started notifications for [actions] characteristic`);
                 }
-                if (!hasPendingActions && started) {
-                    started = false;
-                    try {
-                        yield actionsCharacteristic.stopNotifications();
-                        this.addLog(`Stopped notifications for actions characteristic`);
-                    }
-                    catch (error) {
-                        this.addLog(`Attemped to stop notifications for [actions] characteristic: ${(_b = error === null || error === void 0 ? void 0 : error.message) !== null && _b !== void 0 ? _b : error}`);
-                    }
+                catch (error) {
+                    this.addLog(`Attemped to start notifications for [actions] characteristic: ${(_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error}`);
                 }
-            })));
-            selectedDevice$
-                .pipe(combineLatestWith(osVersion$), switchMap(([selectedDevice, osVersion]) => !osHasBluetoothSupport(selectedDevice, osVersion)
-                ? EMPTY
-                : sideEffects$))
-                .subscribe();
-        });
+            }
+            if (!hasPendingActions && started) {
+                started = false;
+                try {
+                    yield actionsCharacteristic.stopNotifications();
+                    this.addLog(`Stopped notifications for actions characteristic`);
+                }
+                catch (error) {
+                    this.addLog(`Attemped to stop notifications for [actions] characteristic: ${(_b = error === null || error === void 0 ? void 0 : error.message) !== null && _b !== void 0 ? _b : error}`);
+                }
+            }
+        })));
     }
     dispatchAction({ characteristicName, action }) {
         return __awaiter(this, void 0, void 0, function* () {