fix: don't fail loading immediately for NativeAudio if xhr options are supplied when NativeAudio is a connection; ignore xhr options instead

Author: jkeen

ember-stereo/src/-private/utils/strategizer.js

@@ -6,6 +6,8 @@ import { isEmpty } from '@ember/utils';
 import { cached } from 'tracked-toolbox';
 import { assert } from '@ember/debug';
 import { getOwner, setOwner } from '@ember/application';
+import debug from 'debug';
+
 export default class Strategizer {
   @tracked urls;
   @tracked options;
@@ -102,7 +104,10 @@ export default class Strategizer {
         strategies.push(this.buildStrategy(connection, url));
       });
     });
+
     if (this.useMobileStrategy) {
+        debug('ember-stereo:strategizer')(`re-rodering to prioritize native audio first`);
+
       /*
        * Take our standard strategy and reorder it to prioritize native audio
        * first since it's most likely to succeed and play immediately with our

ember-stereo/src/stereo-connections/native-audio.js

@@ -63,10 +63,8 @@ export default class NativeAudio extends BaseSound {
     }
 
     if (this.options?.xhr) {
-      return this.trigger('audio-load-error', {
-        sound: this,
-        error: 'xhr options are not supported in NativeAudio',
-      });
+      this.debug('xhr options are not supported in NativeAudio, ignoring and trying to load anyway')
+      audio.load();
     } else {
       audio.load();
     }
@@ -435,7 +433,7 @@ export default class NativeAudio extends BaseSound {
   }
 
   get shouldRetry() {
-    return this.retryCount < 1 && !this.options?.xhr;
+    return this.retryCount < 1;
   }
 
   retry() {

test-app/tests/unit/stereo-connections/native-audio-test.js

@@ -1,4 +1,4 @@
-import { module, test } from 'qunit';
+import { module, test, skip } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import sinon from 'sinon';
 import SharedAudioAccess from 'ember-stereo/-private/utils/shared-audio-access';
@@ -388,25 +388,17 @@ module('Unit | Connection | Native Audio', function (hooks) {
     );
   });
 
-  test('does not support xhr options', async function (assert) {
-    assert.expect(2);
+  skip('it ignores xhr options', async function (assert) {
     let stereo = this.owner.lookup('service:stereo');
     let url1 = '/good/5000/silence.mp3';
 
-    let { failures } = await stereo.load(url1, {
+    await stereo.load(url1, {
       silenceErrors: true,
       useConnections: ['NativeAudio'],
       xhr: {
         withCredentials: true,
       },
     });
-
-    let erroredSound = failures[0]?.erroredSound;
-    assert.strictEqual(erroredSound.retryCount, 0);
-    assert.strictEqual(
-      erroredSound.error,
-      'xhr options are not supported in NativeAudio'
-    );
   });
 
   test('audio-position-changed events get fired', async function (assert) {