Merge pull request #132 from bridie-hifi/06-10-patch-release

Merge Patch into release
highfidelity · Jun 10, 2021 · 8670151 · 8670151
2 parents 5ff60c1 + dda4e01
commit 8670151
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hifi-spatial-audio",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "The High Fidelity Audio Client Library allows developers to integrate High Fidelity's spatial audio technology into their projects.",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/src/classes/HiFiMixerSession.ts b/src/classes/HiFiMixerSession.ts
@@ -897,6 +897,14 @@ export class HiFiMixerSession {
                 }
                 this._setCurrentHiFiConnectionState(HiFiConnectionStates.Failed);
                 break;
+            case RaviSessionStates.CLOSED:
+                // We don't want to override an "Unavailable" state. (This will hopefully
+                // be able to go away once changes from HIFI-629 are complete, but is safe to leave in for now.)
+                if (this._currentHiFiConnectionState === HiFiConnectionStates.Unavailable) {
+                    break;
+                }
+                this._setCurrentHiFiConnectionState(HiFiConnectionStates.Disconnected);
+                break;
         }
     }
 

diff --git a/tests/smoke/rest.smoke.test.ts b/tests/smoke/rest.smoke.test.ts
@@ -393,8 +393,13 @@ describe('HiFi API REST Calls', () => {
                 });
                 await sleep(30000);
                 for (let i = 0; i < numberTestUsers; i++) {
-                    if (i === 0) expect(testUsers[i].connectionState).toBe(HiFiConnectionStates.Failed);
-                    else expect(testUsers[i].connectionState).toBe(HiFiConnectionStates.Connected);
+                    if (i === 0) {
+                       expect(testUsers[i].connectionFailed).toBe(true);
+                       expect(testUsers[i].connectionState).toBe(HiFiConnectionStates.Disconnected);
+                    } else {
+                       expect(testUsers[i].connectionFailed).toBe(false);
+                       expect(testUsers[i].connectionState).toBe(HiFiConnectionStates.Connected);
+                    }
                 }
             });
 
@@ -404,7 +409,8 @@ describe('HiFi API REST Calls', () => {
                 });
                 await sleep(30000);
                 for (let i = 0; i < numberTestUsers; i++) {
-                    expect(testUsers[i].connectionState).toBe(HiFiConnectionStates.Failed);
+                    expect(testUsers[i].connectionFailed).toBe(true);
+                    expect(testUsers[i].connectionState).toBe(HiFiConnectionStates.Disconnected);
                 }
             });
         });

diff --git a/tests/testUtilities/TestUser.ts b/tests/testUtilities/TestUser.ts
@@ -5,11 +5,13 @@ export type MuteState = "MUTED_FIXED" | "MUTED_NOT_FIXED" | "UNMUTED";
 export class TestUser {
     name: string;
     connectionState: HiFiConnectionStates;
+    connectionFailed: boolean;
     muteState: MuteState;
     communicator: HiFiCommunicator;
 
     constructor(name: string) {
         this.name = name;
+        this.connectionFailed = false;
         this.connectionState = HiFiConnectionStates.Disconnected;
         this.muteState = "UNMUTED";
         this.communicator = new HiFiCommunicator({
@@ -20,6 +22,9 @@ export class TestUser {
 
     onConnectionStateChanged(connectionState: HiFiConnectionStates) {
         this.connectionState = connectionState;
+        if (connectionState === HiFiConnectionStates.Failed) {
+            this.connectionFailed = true;
+        }
     }
 
     onMuteChanged(data: any) {