@neurosity/sdk 6.4.0-next.0 → 6.4.0

package/dist/cjs/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/cjs/Neurosity.js

@@ -100,7 +100,7 @@ class Neurosity {
         if (!!bluetoothTransport) {
             this.bluetoothClient = new bluetooth_1.BluetoothClient({
                 selectedDevice$: this.onDeviceChange(),
-                osVersion$: this.osVersion(),
+                osHasBluetoothSupport$: this._osHasBluetoothSupport(),
                 createBluetoothToken: this.createBluetoothToken.bind(this),
                 transport: bluetoothTransport
             });
@@ -131,6 +131,16 @@ class Neurosity {
             this.streamingMode$.next(streamingMode);
         }
     }
+    /**
+     *
+     * @hidden
+     */
+    _osHasBluetoothSupport() {
+        return (0, rxjs_1.combineLatest)({
+            selectedDevice: this.onDeviceChange(),
+            osVersion: this.osVersion().pipe((0, operators_1.startWith)(null))
+        }).pipe((0, operators_1.map)(({ selectedDevice, osVersion }) => (0, bluetooth_1.osHasBluetoothSupport)(selectedDevice, osVersion)));
+    }
     /**
      * Subscribe to the device's streaming state changes and the current strategy
      *
@@ -146,12 +156,14 @@ class Neurosity {
     streamingState() {
         const isWifiOnline = (state) => [status_1.STATUS.ONLINE, status_1.STATUS.UPDATING].includes(state);
         return this.streamingMode$.pipe((0, operators_1.switchMap)((streamingMode) => {
-            return this.onDeviceChange().pipe((0, operators_2.combineLatestWith)(this.osVersion()), (0, operators_1.switchMap)(([selectDevice, osVersion]) => {
-                if (!selectDevice) {
+            return (0, rxjs_1.combineLatest)({
+                selectedDevice: this.onDeviceChange(),
+                osHasBluetoothSupport: this._osHasBluetoothSupport()
+            }).pipe((0, operators_1.switchMap)(({ selectedDevice, osHasBluetoothSupport }) => {
+                if (!selectedDevice) {
                     return rxjs_2.EMPTY;
                 }
-                const isUnableToUseBluetooth = this.isMissingBluetoothTransport ||
-                    !(0, bluetooth_1.osHasBluetoothSupport)(selectDevice, osVersion);
+                const isUnableToUseBluetooth = this.isMissingBluetoothTransport || !osHasBluetoothSupport;
                 if (isUnableToUseBluetooth) {
                     return this.cloudClient.status().pipe((0, operators_1.map)(({ state }) => ({
                         connected: isWifiOnline(state),
@@ -195,7 +207,7 @@ class Neurosity {
                                     : streaming_1.STREAMING_TYPE.WIFI
                             };
                     }
-                }), (0, operators_1.distinctUntilChanged)((a, b) => (0, fast_deep_equal_1.default)(a, b)));
+                }), (0, operators_2.distinctUntilChanged)((a, b) => (0, fast_deep_equal_1.default)(a, b)));
             }));
         }));
     }

package/dist/cjs/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/cjs/api/bluetooth/BluetoothClient.js

@@ -13,18 +13,16 @@ exports.BluetoothClient = void 0;
 const rxjs_1 = require("rxjs");
 const rxjs_2 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const operators_2 = require("rxjs/operators");
 const WebBluetoothTransport_1 = require("./web/WebBluetoothTransport");
 const ReactNativeTransport_1 = require("./react-native/ReactNativeTransport");
 const csvBufferToEpoch_1 = require("./utils/csvBufferToEpoch");
 const types_1 = require("./types");
-const osHasBluetoothSupport_1 = require("./utils/osHasBluetoothSupport");
 class BluetoothClient {
     constructor(options) {
         this.selectedDevice$ = new rxjs_2.ReplaySubject(1);
-        this.osVersion$ = new rxjs_2.ReplaySubject(1);
+        this.osHasBluetoothSupport$ = new rxjs_2.ReplaySubject(1);
         this.isAuthenticated$ = new rxjs_2.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.`);
         }
@@ -33,9 +31,14 @@ 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((0, operators_1.switchMap)((osHasBluetoothSupport) => osHasBluetoothSupport
+            ? this.transport._autoConnect(this.selectedDevice$)
+            : rxjs_2.EMPTY))
             .subscribe({
             error: (error) => {
                 var _a;
@@ -51,7 +54,11 @@ class BluetoothClient {
             this.transport.addLog("Auto authentication not enabled");
         }
         // Auto manage action notifications
-        this.transport._autoToggleActionNotifications(this.selectedDevice$, this.osVersion$);
+        this.osHasBluetoothSupport$
+            .pipe((0, operators_1.switchMap)((osHasBluetoothSupport) => osHasBluetoothSupport
+            ? this.transport._autoToggleActionNotifications()
+            : rxjs_2.EMPTY))
+            .subscribe();
         // Multicast metrics (share)
         this._focus$ = this._subscribeWhileAuthenticated("focus");
         this._calm$ = this._subscribeWhileAuthenticated("calm");
@@ -75,28 +82,24 @@ class BluetoothClient {
         const reauthenticateInterval$ = (0, rxjs_1.timer)(0, REAUTHENTICATE_INTERVAL).pipe((0, operators_1.tap)(() => {
             this.transport.addLog(`Auto authentication in progress...`);
         }));
-        return this.selectedDevice$.pipe((0, operators_1.combineLatestWith)(this.osVersion$), (0, operators_1.switchMap)(([selectedDevice, osVersion]) => !(0, osHasBluetoothSupport_1.osHasBluetoothSupport)(selectedDevice, osVersion)
-            ? rxjs_2.EMPTY
-            : this.connection().pipe((0, operators_1.switchMap)((connection) => connection === types_1.BLUETOOTH_CONNECTION.CONNECTED
-                ? reauthenticateInterval$
-                : rxjs_2.EMPTY), (0, operators_1.switchMap)(() => __awaiter(this, void 0, void 0, function* () { return yield this.isAuthenticated(); })), (0, operators_1.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((0, operators_1.switchMap)((osHasBluetoothSupport) => osHasBluetoothSupport ? this.connection() : rxjs_2.EMPTY), (0, operators_1.switchMap)((connection) => connection === types_1.BLUETOOTH_CONNECTION.CONNECTED
+            ? reauthenticateInterval$
+            : rxjs_2.EMPTY), (0, operators_1.switchMap)(() => __awaiter(this, void 0, void 0, function* () { return yield this.isAuthenticated(); })), (0, operators_1.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 (0, rxjs_1.firstValueFrom)(this.selectedDevice$);
-            const osVersion = yield (0, rxjs_1.firstValueFrom)(this.osVersion$);
-            return (0, osHasBluetoothSupport_1.osHasBluetoothSupport)(selectedDevice, osVersion);
+            return yield (0, rxjs_2.firstValueFrom)(this.osHasBluetoothSupport$);
         });
     }
     authenticate(token) {
@@ -167,7 +170,7 @@ class BluetoothClient {
                 this.transport.addLog(errorMessage);
                 return Promise.reject(errorMessage);
             }
-            const isAuthenticated = yield (0, rxjs_1.firstValueFrom)(this.isAuthenticated$);
+            const isAuthenticated = yield (0, rxjs_2.firstValueFrom)(this.isAuthenticated$);
             if (!isAuthenticated) {
                 const errorMessage = `Authentication required.`;
                 this.transport.addLog(errorMessage);
@@ -177,13 +180,11 @@ class BluetoothClient {
         });
     }
     _subscribeWhileAuthenticated(characteristicName) {
-        return this.selectedDevice$.pipe((0, operators_1.combineLatestWith)(this.osVersion$), (0, operators_1.switchMap)(([selectedDevice, osVersion]) => !(0, osHasBluetoothSupport_1.osHasBluetoothSupport)(selectedDevice, osVersion)
-            ? rxjs_2.EMPTY
-            : this.isAuthenticated$.pipe((0, operators_2.distinctUntilChanged)(), (0, operators_1.switchMap)((isAuthenticated) => isAuthenticated
-                ? this.transport.subscribeToCharacteristic({
-                    characteristicName
-                })
-                : rxjs_2.EMPTY))), (0, operators_1.share)());
+        return this.osHasBluetoothSupport$.pipe((0, operators_1.switchMap)((osHasBluetoothSupport) => osHasBluetoothSupport ? this.isAuthenticated$ : rxjs_2.EMPTY), (0, operators_1.distinctUntilChanged)(), (0, operators_1.switchMap)((isAuthenticated) => isAuthenticated
+            ? this.transport.subscribeToCharacteristic({
+                characteristicName
+            })
+            : rxjs_2.EMPTY), (0, operators_1.share)());
     }
     focus() {
         return this._focus$;
@@ -224,7 +225,7 @@ class BluetoothClient {
     }
     getInfo() {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this._withAuthentication(() => (0, rxjs_1.firstValueFrom)(this.transport.subscribeToCharacteristic({
+            return yield this._withAuthentication(() => (0, rxjs_2.firstValueFrom)(this.transport.subscribeToCharacteristic({
                 characteristicName: "deviceInfo"
             })));
         });

package/dist/cjs/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/cjs/api/bluetooth/react-native/ReactNativeTransport.js

@@ -26,7 +26,6 @@ const constants_1 = require("../constants");
 const constants_2 = require("../constants");
 const constants_3 = require("../constants");
 const constants_4 = require("../constants");
-const osHasBluetoothSupport_1 = require("../utils/osHasBluetoothSupport");
 const defaultOptions = {
     autoConnect: true
 };
@@ -104,16 +103,14 @@ class ReactNativeTransport {
         const connection = this.connection$.getValue();
         return connection === types_1.BLUETOOTH_CONNECTION.CONNECTED;
     }
-    _autoConnect(selectedDevice$, osVersion$) {
+    _autoConnect(selectedDevice$) {
         const selectedDeviceAfterDisconnect$ = this.onDisconnected$.pipe((0, operators_1.switchMap)(() => selectedDevice$));
         return this._isAutoConnectEnabled$.pipe((0, operators_1.switchMap)((isAutoConnectEnabled) => isAutoConnectEnabled
-            ? (0, rxjs_1.merge)(selectedDevice$, selectedDeviceAfterDisconnect$)
-            : rxjs_2.NEVER), (0, operators_3.combineLatestWith)(osVersion$), (0, operators_1.switchMap)(([selectedDevice, osVersion]) => !(0, osHasBluetoothSupport_1.osHasBluetoothSupport)(selectedDevice, osVersion)
-            ? rxjs_2.NEVER
-            : this.scan().pipe((0, operators_1.switchMap)((peripherals) => {
-                const peripheralMatch = peripherals.find((peripheral) => peripheral.name === (selectedDevice === null || selectedDevice === void 0 ? void 0 : selectedDevice.deviceNickname));
-                return peripheralMatch ? (0, rxjs_1.of)(peripheralMatch) : rxjs_2.NEVER;
-            }), (0, operators_3.distinct)((peripheral) => peripheral.id), (0, operators_3.take)(1))), (0, operators_1.switchMap)((peripheral) => __awaiter(this, void 0, void 0, function* () {
+            ? (0, rxjs_2.merge)(selectedDevice$, selectedDeviceAfterDisconnect$)
+            : rxjs_1.NEVER), (0, operators_1.switchMap)((selectedDevice) => this.scan().pipe((0, operators_1.switchMap)((peripherals) => {
+            const peripheralMatch = peripherals.find((peripheral) => peripheral.name === (selectedDevice === null || selectedDevice === void 0 ? void 0 : selectedDevice.deviceNickname));
+            return peripheralMatch ? (0, rxjs_2.of)(peripheralMatch) : rxjs_1.NEVER;
+        }), (0, operators_3.distinct)((peripheral) => peripheral.id), (0, operators_3.take)(1))), (0, operators_1.switchMap)((peripheral) => __awaiter(this, void 0, void 0, function* () {
             return yield this.connect(peripheral);
         })));
     }
@@ -145,7 +142,7 @@ class ReactNativeTransport {
         const serviceUUIDs = [ipk_1.BLUETOOTH_PRIMARY_SERVICE_UUID_STRING];
         const allowDuplicates = true;
         const scanOptions = {};
-        const scanOnce$ = new rxjs_2.Observable((subscriber) => {
+        const scanOnce$ = new rxjs_1.Observable((subscriber) => {
             var _a;
             try {
                 this.BleManager.scan(serviceUUIDs, seconds, allowDuplicates, scanOptions).then(() => {
@@ -163,7 +160,7 @@ class ReactNativeTransport {
         });
         const scan$ = once
             ? scanOnce$
-            : (0, rxjs_1.timer)(0, RESCAN_INTERVAL).pipe((0, operators_1.switchMap)(() => scanOnce$));
+            : (0, rxjs_2.timer)(0, RESCAN_INTERVAL).pipe((0, operators_1.switchMap)(() => scanOnce$));
         const peripherals$ = scan$.pipe((0, operators_1.tap)(() => {
             if (!skipConnectionUpdate) {
                 this.connection$.next(types_1.BLUETOOTH_CONNECTION.SCANNING);
@@ -261,7 +258,7 @@ class ReactNativeTransport {
         return (_a = this.characteristicsByName) === null || _a === void 0 ? void 0 : _a[characteristicName];
     }
     subscribeToCharacteristic({ characteristicName, manageNotifications = true }) {
-        const getData = ({ peripheralId, serviceUUID, characteristicUUID }) => (0, rxjs_1.defer)(() => __awaiter(this, void 0, void 0, function* () {
+        const getData = ({ peripheralId, serviceUUID, characteristicUUID }) => (0, rxjs_2.defer)(() => __awaiter(this, void 0, void 0, function* () {
             var _a;
             if (manageNotifications) {
                 try {
@@ -295,7 +292,7 @@ class ReactNativeTransport {
         }));
         return this.connection$.pipe((0, operators_1.switchMap)((connection) => connection === types_1.BLUETOOTH_CONNECTION.CONNECTED
             ? getData(this.getCharacteristicByName(characteristicName))
-            : rxjs_2.NEVER));
+            : rxjs_1.NEVER));
     }
     readCharacteristic(characteristicName, parse = false) {
         var _a;
@@ -336,42 +333,35 @@ 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((0, operators_1.switchMap)((connection) => connection === types_1.BLUETOOTH_CONNECTION.CONNECTED
-                ? this.pendingActions$
-                : rxjs_2.NEVER), (0, operators_1.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((0, operators_1.switchMap)((connection) => connection === types_1.BLUETOOTH_CONNECTION.CONNECTED
+            ? this.pendingActions$
+            : rxjs_1.NEVER), (0, operators_1.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((0, operators_3.combineLatestWith)(osVersion$), (0, operators_1.switchMap)(([selectedDevice, osVersion]) => !(0, osHasBluetoothSupport_1.osHasBluetoothSupport)(selectedDevice, osVersion)
-                ? rxjs_2.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* () {
@@ -382,7 +372,7 @@ class ReactNativeTransport {
                 this.addLog(`Dispatched action with id ${actionId}`);
                 if (responseRequired && responseTimeout) {
                     this._addPendingAction(actionId);
-                    const timeout = (0, rxjs_1.timer)(responseTimeout).subscribe(() => {
+                    const timeout = (0, rxjs_2.timer)(responseTimeout).subscribe(() => {
                         this._removePendingAction(actionId);
                         reject(new Error(`Action with id ${actionId} timed out after ${responseTimeout}ms`));
                     });

package/dist/cjs/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/cjs/api/bluetooth/web/WebBluetoothTransport.js

@@ -26,7 +26,6 @@ const encoding_1 = require("../utils/encoding");
 const types_1 = require("../types");
 const constants_1 = require("../constants");
 const constants_2 = require("../constants");
-const osHasBluetoothSupport_1 = require("../utils/osHasBluetoothSupport");
 const defaultOptions = {
     autoConnect: true
 };
@@ -64,12 +63,10 @@ class WebBluetoothTransport {
             return yield navigator.bluetooth.getDevices();
         });
     }
-    _autoConnect(selectedDevice$, osVersion$) {
+    _autoConnect(selectedDevice$) {
         return this._isAutoConnectEnabled$.pipe((0, operators_1.switchMap)((isAutoConnectEnabled) => isAutoConnectEnabled
-            ? (0, rxjs_1.merge)(selectedDevice$, this.onDisconnected$.pipe((0, operators_1.switchMap)(() => selectedDevice$)))
-            : rxjs_2.NEVER), (0, operators_1.combineLatestWith)(osVersion$), (0, operators_1.switchMap)(([selectedDevice, osVersion]) => (0, osHasBluetoothSupport_1.osHasBluetoothSupport)(selectedDevice, osVersion)
-            ? (0, rxjs_1.of)(selectedDevice)
-            : rxjs_2.EMPTY), (0, operators_1.switchMap)((selectedDevice) => __awaiter(this, void 0, void 0, function* () {
+            ? (0, rxjs_2.merge)(selectedDevice$, this.onDisconnected$.pipe((0, operators_1.switchMap)(() => selectedDevice$)))
+            : rxjs_2.NEVER), (0, operators_1.switchMap)((selectedDevice) => __awaiter(this, void 0, void 0, function* () {
             var _a;
             const { deviceNickname } = selectedDevice;
             if (this.isConnected()) {
@@ -215,7 +212,7 @@ class WebBluetoothTransport {
         });
     }
     subscribeToCharacteristic({ characteristicName, manageNotifications = true }) {
-        const data$ = (0, rxjs_1.defer)(() => this.getCharacteristicByName(characteristicName)).pipe((0, operators_1.switchMap)((characteristic) => __awaiter(this, void 0, void 0, function* () {
+        const data$ = (0, rxjs_2.defer)(() => this.getCharacteristicByName(characteristicName)).pipe((0, operators_1.switchMap)((characteristic) => __awaiter(this, void 0, void 0, function* () {
             var _a;
             if (this.isConnected() && manageNotifications) {
                 try {
@@ -309,45 +306,38 @@ 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((0, operators_1.switchMap)((connection) => connection === types_1.BLUETOOTH_CONNECTION.CONNECTED
-                ? (0, rxjs_1.defer)(() => this.getCharacteristicByName("actions")).pipe((0, operators_1.switchMap)((characteristic) => {
-                    actionsCharacteristic = characteristic;
-                    return this.pendingActions$;
-                }))
-                : rxjs_2.NEVER), (0, operators_1.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((0, operators_1.switchMap)((connection) => connection === types_1.BLUETOOTH_CONNECTION.CONNECTED
+            ? (0, rxjs_2.defer)(() => this.getCharacteristicByName("actions")).pipe((0, operators_1.switchMap)((characteristic) => {
+                actionsCharacteristic = characteristic;
+                return this.pendingActions$;
+            }))
+            : rxjs_2.NEVER), (0, operators_1.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((0, operators_1.combineLatestWith)(osVersion$), (0, operators_1.switchMap)(([selectedDevice, osVersion]) => !(0, osHasBluetoothSupport_1.osHasBluetoothSupport)(selectedDevice, osVersion)
-                ? rxjs_2.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* () {
@@ -364,7 +354,7 @@ class WebBluetoothTransport {
                 this.addLog(`Dispatched action with id ${actionId}`);
                 if (responseRequired && responseTimeout) {
                     this._addPendingAction(actionId);
-                    const timeout = (0, rxjs_1.timer)(responseTimeout).subscribe(() => {
+                    const timeout = (0, rxjs_2.timer)(responseTimeout).subscribe(() => {
                         this._removePendingAction(actionId);
                         reject(`Action with id ${actionId} timed out after ${responseTimeout}ms`);
                     });
@@ -410,7 +400,7 @@ function fromDOMEvent(target, eventName, beforeRemove) {
     }));
 }
 function onAdvertisementReceived(device) {
-    return new rxjs_2.Observable((subscriber) => {
+    return new rxjs_1.Observable((subscriber) => {
         const abortController = new AbortController();
         const { signal } = abortController;
         const listener = device.addEventListener("advertisementreceived", (advertisement) => {