Adding back accidentally removed code

amazon-connect · Nov 29, 2024 · 3a573fb · 3a573fb
1 parent 0496709
commit 3a573fb
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 5 deletions.
diff --git a/release/connect-streams-dr-min.js b/release/connect-streams-dr-min.js
diff --git a/release/connect-streams-dr.js b/release/connect-streams-dr.js
diff --git a/release/connect-streams-min.js b/release/connect-streams-min.js
diff --git a/release/connect-streams.js b/release/connect-streams.js
@@ -10827,9 +10827,10 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
     this.agentUpdateSubscriber = this.bus.subscribe(connect.AgentEvents.UPDATE, connect.hitch(this, this.updateAgentData));
   };
   AgentDataProvider.prototype.updateAgentData = function (agentData) {
+    var _connect$agent;
     var oldAgentData = this.agentData;
     this.agentData = agentData;
-    if (oldAgentData == null) {
+    if (!((_connect$agent = connect.agent) !== null && _connect$agent !== void 0 && _connect$agent.initialized)) {
       connect.agent.initialized = true;
       this.bus.trigger(connect.AgentEvents.INIT, new connect.Agent());
     }

diff --git a/src/core.js b/src/core.js
@@ -2053,7 +2053,7 @@ connect.core.setSoftphoneUserMediaStream = function (stream) {
     var oldAgentData = this.agentData;
     this.agentData = agentData;
 
-    if (oldAgentData == null) {
+    if (!connect.agent?.initialized) {
       connect.agent.initialized = true;
       this.bus.trigger(connect.AgentEvents.INIT, new connect.Agent());
     }

diff --git a/test/unit/global-resiliency.spec.js b/test/unit/global-resiliency.spec.js
@@ -519,5 +519,52 @@ describe('Global Resiliency', function () {
 
             assert.isFalse(didSwitch);
          });
+
+        it("should call _refreshRtcPeerConnectionFactory when initialize region", function () {
+            const fakeGrProxyConduit = {
+                setActiveConduit: sinon.stub(),
+                getActiveConduit: sinon.stub().returns({ keepalivemanager: 0, sendUpstream: sinon.stub() }),
+                getInactiveConduit: sinon.stub().returns({ keepalivemanager: 0, sendUpstream: sinon.stub() }),
+            };
+
+            connect.core.softphoneManager = { _refreshRtcPeerConnectionFactory: sinon.stub() }
+
+            const region = 'us-east-1';
+
+            const oldClient = connect.core.client;
+            const oldMasterClient = connect.core.masterClient;
+
+            connect.globalResiliency._initializeActiveRegion(fakeGrProxyConduit, region);
+
+            connect.core.masterClient = oldMasterClient;
+            connect.core.client = oldClient;
+
+            assert.isTrue(connect.core.softphoneManager._refreshRtcPeerConnectionFactory.calledOnce);
+        });
+
+        it("should call _initiateRtcPeerConnectionManager when initialize region and instance is allowlisted for softphone persistent connection feature", function () {
+            const fakeGrProxyConduit = {
+                setActiveConduit: sinon.stub(),
+                getActiveConduit: sinon.stub().returns({ keepalivemanager: 0, sendUpstream: sinon.stub() }),
+                getInactiveConduit: sinon.stub().returns({ keepalivemanager: 0, sendUpstream: sinon.stub() }),
+            };
+
+            connect.core._allowSoftphonePersistentConnection = true;
+            connect.core.softphoneManager = { _initiateRtcPeerConnectionManager: sinon.stub() }
+
+            const region = 'us-east-1';
+
+            const oldClient = connect.core.client;
+            const oldMasterClient = connect.core.masterClient;
+
+            connect.globalResiliency._initializeActiveRegion(fakeGrProxyConduit, region);
+
+            // Need to reset these or softphone unit test will fail due to missing client
+            connect.core.masterClient = oldMasterClient;
+            connect.core.client = oldClient;
+            connect.core._allowSoftphonePersistentConnection = null;
+
+            assert.isTrue(connect.core.softphoneManager._initiateRtcPeerConnectionManager.calledOnce);
+        });
     });
 });