Merge pull request #13 from neocortex-link/hotfix/web-request

Progress and WebRequest Cancellation

Author: srcnalt

CHANGELOG.md

@@ -4,19 +4,22 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.3.3] - 18 February 2024
+## [0.3.4] - 21 February 2025
+- Webrequest progress property and cancellation support
+
+## [0.3.3] - 18 February 2025
 - Various UI Elements fixes
 - Web Request class decoupling
 - Writing Indicator for Chat Panel
 
-## [0.3.2] - 12 February 2024
+## [0.3.2] - 12 February 2025
 - Right-to-Left language support in Chat Panel 
 
-## [0.3.1] - 3 February 2024
+## [0.3.1] - 3 February 2025
 - Microphone dropdown component
 - Component and sample updates
 
-## [0.3.0] - 21 January 2024
+## [0.3.0] - 21 January 2025
 - WebGL audio support
 
 ## [0.2.0] - 6 December 2024

Runtime/API/V1/Services/WebRequest.cs

@@ -1,6 +1,9 @@
+using System;
+using System.Linq;
 using UnityEngine;
 using Neocortex.Data;
 using Newtonsoft.Json;
+using System.Threading;
 using System.Threading.Tasks;
 using UnityEngine.Networking;
 using System.Collections.Generic;
@@ -9,7 +12,9 @@ namespace Neocortex.API
 {
     public class WebRequest
     {
-        protected Dictionary<string, string> Headers = new ();
+        public float Progress { get; private set; }
+        protected Dictionary<string, string> Headers = new();
+        protected CancellationTokenSource CtxSource = new();
 
         protected async Task<UnityWebRequest> Send(ApiPayload payload)
         {
@@ -39,8 +44,18 @@ protected async Task<UnityWebRequest> Send(ApiPayload payload)
 
             AsyncOperation asyncOperation = webRequest.SendWebRequest();
 
-            while (!asyncOperation.isDone) await Task.Yield();
-
+            while (!asyncOperation.isDone)
+            {
+                if (CtxSource != null && CtxSource.IsCancellationRequested)
+                {
+                    webRequest.Abort();
+                }
+                
+                Progress = asyncOperation.progress;
+                
+                await Task.Yield();
+            }
+            
             if (webRequest.result == UnityWebRequest.Result.Success)
             {
                 return webRequest;
@@ -50,6 +65,11 @@ protected async Task<UnityWebRequest> Send(ApiPayload payload)
             return null;
         }
 
+        public void Abort()
+        {
+            CtxSource.Cancel();
+        }
+
         protected byte[] GetBytes(object payload)
         {
             string json = JsonConvert.SerializeObject(payload);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "link.neocortex.sdk",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "displayName": "Neocortex Unity SDK",
   "description": "Conversational AI for Games Simplified. With Neocortex SDK, create dynamic in-game conversations with AI-powered smart characters using our node-based editor and SDKs.",
   "unity": "2021.3",