@neurosity/sdk 6.3.0 → 6.4.0-next.0

package/dist/browser/neurosity.iife.js

@@ -2307,6 +2307,11 @@ var Neurosity = (function (exports) {
 
   var NEVER = new Observable(noop);
 
+  var isArray$2 = Array.isArray;
+  function argsOrArgArray(args) {
+      return args.length === 1 && isArray$2(args[0]) ? args[0] : args;
+  }
+
   function filter(predicate, thisArg) {
       return operate(function (source, subscriber) {
           var index = 0;
@@ -2435,6 +2440,27 @@ var Neurosity = (function (exports) {
       };
   }
 
+  function combineLatest$1() {
+      var args = [];
+      for (var _i = 0; _i < arguments.length; _i++) {
+          args[_i] = arguments[_i];
+      }
+      var resultSelector = popResultSelector(args);
+      return resultSelector
+          ? pipe(combineLatest$1.apply(void 0, __spreadArray([], __read(args))), mapOneOrManyArgs(resultSelector))
+          : operate(function (source, subscriber) {
+              combineLatestInit(__spreadArray([source], __read(argsOrArgArray(args))))(subscriber);
+          });
+  }
+
+  function combineLatestWith() {
+      var otherSources = [];
+      for (var _i = 0; _i < arguments.length; _i++) {
+          otherSources[_i] = arguments[_i];
+      }
+      return combineLatest$1.apply(void 0, __spreadArray([], __read(otherSources)));
+  }
+
   function concatMap(project, resultSelector) {
       return isFunction(resultSelector) ? mergeMap(project, resultSelector, 1) : mergeMap(project, 1);
   }
@@ -43007,6 +43033,7 @@ var Neurosity = (function (exports) {
           this.firebaseUser = new FirebaseUser(this.firebaseApp);
           this._selectedDevice.next(undefined);
           this.status$ = heartbeatAwareStatus(this.observeNamespace("status").pipe(share())).pipe(filterInternalKeys(), shareReplay(1));
+          this.osVersion$ = this.observeNamespace("info/osVersion").pipe(shareReplay(1));
           this.firebaseUser.onAuthStateChanged().subscribe((user) => {
               this.user = user;
           });
@@ -43040,6 +43067,9 @@ var Neurosity = (function (exports) {
               .asObservable()
               .pipe(filter((value) => value !== undefined));
       }
+      osVersion() {
+          return this.osVersion$;
+      }
       // Automatically select device when user logs in
       setAutoSelectedDevice() {
           return __awaiter$b(this, void 0, void 0, function* () {
@@ -46304,7 +46334,7 @@ var Neurosity = (function (exports) {
   const gte = (a, b, loose) => compare_1(a, b, loose) >= 0;
   var gte_1 = gte;
 
-  function osHasBluetoothSupport(selectedDevice) {
+  function osHasBluetoothSupport(selectedDevice, osVersion) {
       if (!selectedDevice) {
           return false;
       }
@@ -46317,7 +46347,9 @@ var Neurosity = (function (exports) {
       if (isEmulator) {
           return false;
       }
-      return gte_1(selectedDevice.osVersion, "16.0.0");
+      // `osVersion` is updated in real time,
+      // unlike accessing via `selectedDevice.osVersion`
+      return gte_1(osVersion !== null && osVersion !== void 0 ? osVersion : selectedDevice.osVersion, "16.0.0");
   }
 
   var __awaiter$d = function (thisArg, _arguments, P, generator) {
@@ -46366,10 +46398,12 @@ var Neurosity = (function (exports) {
               return yield navigator.bluetooth.getDevices();
           });
       }
-      _autoConnect(selectedDevice$) {
+      _autoConnect(selectedDevice$, osVersion$) {
           return this._isAutoConnectEnabled$.pipe(switchMap((isAutoConnectEnabled) => isAutoConnectEnabled
               ? merge(selectedDevice$, this.onDisconnected$.pipe(switchMap(() => selectedDevice$)))
-              : NEVER), switchMap((selectedDevice) => osHasBluetoothSupport(selectedDevice) ? of(selectedDevice) : EMPTY), switchMap((selectedDevice) => __awaiter$d(this, void 0, void 0, function* () {
+              : NEVER), combineLatestWith(osVersion$), switchMap(([selectedDevice, osVersion]) => osHasBluetoothSupport(selectedDevice, osVersion)
+              ? of(selectedDevice)
+              : EMPTY), switchMap((selectedDevice) => __awaiter$d(this, void 0, void 0, function* () {
               var _a;
               const { deviceNickname } = selectedDevice;
               if (this.isConnected()) {
@@ -46609,7 +46643,7 @@ var Neurosity = (function (exports) {
           const actions = this.pendingActions$.getValue();
           this.pendingActions$.next(actions.filter((id) => id !== actionId));
       }
-      _autoToggleActionNotifications(selectedDevice$) {
+      _autoToggleActionNotifications(selectedDevice$, osVersion$) {
           return __awaiter$d(this, void 0, void 0, function* () {
               let actionsCharacteristic;
               let started = false;
@@ -46643,7 +46677,9 @@ var Neurosity = (function (exports) {
                   }
               })));
               selectedDevice$
-                  .pipe(switchMap((selectedDevice) => !osHasBluetoothSupport(selectedDevice) ? EMPTY : sideEffects$))
+                  .pipe(combineLatestWith(osVersion$), switchMap(([selectedDevice, osVersion]) => !osHasBluetoothSupport(selectedDevice, osVersion)
+                  ? EMPTY
+                  : sideEffects$))
                   .subscribe();
           });
       }
@@ -46816,11 +46852,11 @@ var Neurosity = (function (exports) {
           const connection = this.connection$.getValue();
           return connection === exports.BLUETOOTH_CONNECTION.CONNECTED;
       }
-      _autoConnect(selectedDevice$) {
+      _autoConnect(selectedDevice$, osVersion$) {
           const selectedDeviceAfterDisconnect$ = this.onDisconnected$.pipe(switchMap(() => selectedDevice$));
           return this._isAutoConnectEnabled$.pipe(switchMap((isAutoConnectEnabled) => isAutoConnectEnabled
               ? merge(selectedDevice$, selectedDeviceAfterDisconnect$)
-              : NEVER), switchMap((selectedDevice) => !osHasBluetoothSupport(selectedDevice)
+              : 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));
@@ -47048,7 +47084,7 @@ var Neurosity = (function (exports) {
           const actions = this.pendingActions$.getValue();
           this.pendingActions$.next(actions.filter((id) => id !== actionId));
       }
-      _autoToggleActionNotifications(selectedDevice$) {
+      _autoToggleActionNotifications(selectedDevice$, osVersion$) {
           return __awaiter$e(this, void 0, void 0, function* () {
               let started = false;
               const sideEffects$ = this.connection$.asObservable().pipe(switchMap((connection) => connection === exports.BLUETOOTH_CONNECTION.CONNECTED
@@ -47079,7 +47115,9 @@ var Neurosity = (function (exports) {
                   }
               })));
               selectedDevice$
-                  .pipe(switchMap((selectedDevice) => !osHasBluetoothSupport(selectedDevice) ? EMPTY : sideEffects$))
+                  .pipe(combineLatestWith(osVersion$), switchMap(([selectedDevice, osVersion]) => !osHasBluetoothSupport(selectedDevice, osVersion)
+                  ? EMPTY
+                  : sideEffects$))
                   .subscribe();
           });
       }
@@ -47232,6 +47270,7 @@ var Neurosity = (function (exports) {
   class BluetoothClient {
       constructor(options) {
           this.selectedDevice$ = new ReplaySubject(1);
+          this.osVersion$ = new ReplaySubject(1);
           this.isAuthenticated$ = new ReplaySubject(1);
           const { transport, selectedDevice$, createBluetoothToken } = options !== null && options !== void 0 ? options : {};
           if (!transport) {
@@ -47243,7 +47282,9 @@ var Neurosity = (function (exports) {
               selectedDevice$.subscribe(this.selectedDevice$);
           }
           // Auto Connect
-          this.transport._autoConnect(this.selectedDevice$).subscribe({
+          this.transport
+              ._autoConnect(this.selectedDevice$, this.osVersion$)
+              .subscribe({
               error: (error) => {
                   var _a;
                   this.transport.addLog(`Auto connect: error -> ${(_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error}`);
@@ -47258,7 +47299,7 @@ var Neurosity = (function (exports) {
               this.transport.addLog("Auto authentication not enabled");
           }
           // Auto manage action notifications
-          this.transport._autoToggleActionNotifications(this.selectedDevice$);
+          this.transport._autoToggleActionNotifications(this.selectedDevice$, this.osVersion$);
           // Multicast metrics (share)
           this._focus$ = this._subscribeWhileAuthenticated("focus");
           this._calm$ = this._subscribeWhileAuthenticated("calm");
@@ -47282,7 +47323,7 @@ var Neurosity = (function (exports) {
           const reauthenticateInterval$ = timer(0, REAUTHENTICATE_INTERVAL).pipe(tap(() => {
               this.transport.addLog(`Auto authentication in progress...`);
           }));
-          return this.selectedDevice$.pipe(switchMap((selectedDevice) => !osHasBluetoothSupport(selectedDevice)
+          return this.selectedDevice$.pipe(combineLatestWith(this.osVersion$), switchMap(([selectedDevice, osVersion]) => !osHasBluetoothSupport(selectedDevice, osVersion)
               ? EMPTY
               : this.connection().pipe(switchMap((connection) => connection === exports.BLUETOOTH_CONNECTION.CONNECTED
                   ? reauthenticateInterval$
@@ -47302,7 +47343,8 @@ var Neurosity = (function (exports) {
       _hasBluetoothSupport() {
           return __awaiter$f(this, void 0, void 0, function* () {
               const selectedDevice = yield firstValueFrom(this.selectedDevice$);
-              return osHasBluetoothSupport(selectedDevice);
+              const osVersion = yield firstValueFrom(this.osVersion$);
+              return osHasBluetoothSupport(selectedDevice, osVersion);
           });
       }
       authenticate(token) {
@@ -47383,7 +47425,7 @@ var Neurosity = (function (exports) {
           });
       }
       _subscribeWhileAuthenticated(characteristicName) {
-          return this.selectedDevice$.pipe(switchMap((selectedDevice) => !osHasBluetoothSupport(selectedDevice)
+          return this.selectedDevice$.pipe(combineLatestWith(this.osVersion$), switchMap(([selectedDevice, osVersion]) => !osHasBluetoothSupport(selectedDevice, osVersion)
               ? EMPTY
               : this.isAuthenticated$.pipe(distinctUntilChanged(), switchMap((isAuthenticated) => isAuthenticated
                   ? this.transport.subscribeToCharacteristic({
@@ -47570,6 +47612,7 @@ var Neurosity = (function (exports) {
           if (!!bluetoothTransport) {
               this.bluetoothClient = new BluetoothClient({
                   selectedDevice$: this.onDeviceChange(),
+                  osVersion$: this.osVersion(),
                   createBluetoothToken: this.createBluetoothToken.bind(this),
                   transport: bluetoothTransport
               });
@@ -47615,12 +47658,12 @@ var Neurosity = (function (exports) {
       streamingState() {
           const isWifiOnline = (state) => [STATUS.ONLINE, STATUS.UPDATING].includes(state);
           return this.streamingMode$.pipe(switchMap((streamingMode) => {
-              return this.onDeviceChange().pipe(switchMap((selectDevice) => {
+              return this.onDeviceChange().pipe(combineLatestWith(this.osVersion()), switchMap(([selectDevice, osVersion]) => {
                   if (!selectDevice) {
                       return EMPTY;
                   }
                   const isUnableToUseBluetooth = this.isMissingBluetoothTransport ||
-                      !osHasBluetoothSupport(selectDevice);
+                      !osHasBluetoothSupport(selectDevice, osVersion);
                   if (isUnableToUseBluetooth) {
                       return this.cloudClient.status().pipe(map(({ state }) => ({
                           connected: isWifiOnline(state),
@@ -48286,7 +48329,7 @@ var Neurosity = (function (exports) {
           if (hasOAuthError) {
               return throwError(() => OAuthError);
           }
-          return this.cloudClient.observeNamespace("info/osVersion");
+          return this.cloudClient.osVersion();
       }
       /**
        * <StreamingModes wifi={true} bluetooth={true} />