Merge pull request #347 from dvonthenen/organization-change-for-v2

Reorganize Factory, Add CancelToken Option to Send Functions
deepgram · Nov 1, 2024 · 4f1f671 · 4f1f671
2 parents ba0f717 + b52d203
commit 4f1f671
Show file tree

Hide file tree

Showing 32 changed files with 198 additions and 293 deletions.
diff --git a/Deepgram/Abstractions/v2/AbstractRestClient.cs b/Deepgram/Abstractions/v2/AbstractRestClient.cs
@@ -1,4 +1,4 @@
-// Copyright 2021-2024 Deepgram .NET SDK contributors. All Rights Reserved.
+// Copyright 2024 Deepgram .NET SDK contributors. All Rights Reserved.
 // Use of this source code is governed by a MIT license that can be found in the LICENSE file.
 // SPDX-License-Identifier: MIT
 

diff --git a/Deepgram/Abstractions/v2/AbstractWebSocketClient.cs b/Deepgram/Abstractions/v2/AbstractWebSocketClient.cs
@@ -245,7 +245,7 @@ public async Task<bool> Subscribe(EventHandler<ErrorResponse> eventHandler)
     /// <summary>
     /// Sends a Close message to Deepgram
     /// </summary>
-    public virtual Task SendClose(bool nullByte = false)
+    public virtual Task SendClose(bool nullByte = false, CancellationTokenSource? _cancellationToken = null)
     {
         throw new DeepgramException("Unimplemented");
     }
@@ -271,24 +271,27 @@ public virtual void SendMessage(byte[] data, int length = Constants.UseArrayLeng
 
     /// <summary>
     /// This method sends a binary message over the WebSocket connection immediately without queueing.
-    /// </summary>
-    public virtual async Task SendBinaryImmediately(byte[] data, int length = Constants.UseArrayLengthForSend)
+    /// </summary>, 
+    public virtual async Task SendBinaryImmediately(byte[] data, int length = Constants.UseArrayLengthForSend, CancellationTokenSource? _cancellationToken = null)
     {
         if (!IsConnected())
         {
             Log.Debug("SendBinaryImmediately", "WebSocket is not connected. Exiting...");
             return;
         }
 
-        await _mutexSend.WaitAsync(_cancellationTokenSource.Token);
+        // provide a cancellation token, or use the one in the class
+        var _cancelToken = _cancellationToken ?? _cancellationTokenSource;
+
+        await _mutexSend.WaitAsync(_cancelToken.Token);
         try
         {
             Log.Verbose("SendBinaryImmediately", "Sending binary message immediately...");
             if (length == Constants.UseArrayLengthForSend)
             {
                 length = data.Length;
             }
-            await _clientWebSocket.SendAsync(new ArraySegment<byte>(data, 0, length), WebSocketMessageType.Binary, true, _cancellationTokenSource.Token)
+            await _clientWebSocket.SendAsync(new ArraySegment<byte>(data, 0, length), WebSocketMessageType.Binary, true, _cancelToken.Token)
                 .ConfigureAwait(false);
         }
         finally
@@ -300,23 +303,26 @@ await _clientWebSocket.SendAsync(new ArraySegment<byte>(data, 0, length), WebSoc
     /// <summary>
     /// This method sends a text message over the WebSocket connection immediately without queueing.
     /// </summary>
-    public virtual async Task SendMessageImmediately(byte[] data, int length = Constants.UseArrayLengthForSend)
+    public virtual async Task SendMessageImmediately(byte[] data, int length = Constants.UseArrayLengthForSend, CancellationTokenSource? _cancellationToken = null)
     {
         if (!IsConnected())
         {
             Log.Debug("SendBinaryImmediately", "WebSocket is not connected. Exiting...");
             return;
         }
 
-        await _mutexSend.WaitAsync(_cancellationTokenSource.Token);
+        // provide a cancellation token, or use the one in the class
+        var _cancelToken = _cancellationToken ?? _cancellationTokenSource;
+
+        await _mutexSend.WaitAsync(_cancelToken.Token);
         try
         {
             Log.Verbose("SendMessageImmediately", "Sending text message immediately...");
             if (length == Constants.UseArrayLengthForSend)
             {
                 length = data.Length;
             }
-            await _clientWebSocket.SendAsync(new ArraySegment<byte>(data, 0, length), WebSocketMessageType.Text, true, _cancellationTokenSource.Token)
+            await _clientWebSocket.SendAsync(new ArraySegment<byte>(data, 0, length), WebSocketMessageType.Text, true, _cancelToken.Token)
                 .ConfigureAwait(false);
         }
         finally
@@ -613,7 +619,7 @@ public async Task<bool> Stop(CancellationTokenSource? cancelToken = null, bool n
             if (_clientWebSocket!.State == WebSocketState.Open)
             {
                 Log.Debug("Stop", "Sending Close message...");
-                await SendClose(nullByte);
+                await SendClose(nullByte, cancelToken);
             }
 
             // small delay to wait for any final transcription

diff --git a/Deepgram/Abstractions/v2/Utilities.cs b/Deepgram/Abstractions/v2/Utilities.cs
@@ -1,4 +1,4 @@
-// Copyright 2021-2024 Deepgram .NET SDK contributors. All Rights Reserved.
+// Copyright 2024 Deepgram .NET SDK contributors. All Rights Reserved.
 // Use of this source code is governed by a MIT license that can be found in the LICENSE file.
 // SPDX-License-Identifier: MIT
 

diff --git a/Deepgram/Abstractions/v2/WebSocketMessage.cs b/Deepgram/Abstractions/v2/WebSocketMessage.cs
@@ -1,4 +1,4 @@
-// Copyright 2021-2024 Deepgram .NET SDK contributors. All Rights Reserved.
+// Copyright 2024 Deepgram .NET SDK contributors. All Rights Reserved.
 // Use of this source code is governed by a MIT license that can be found in the LICENSE file.
 // SPDX-License-Identifier: MIT