Add IRequest.RequestAborted

mythz · mythz · commit 3d1be946e4e8 · 2026-04-08T18:31:14.000+08:00
diff --git a/ServiceStack/src/ServiceStack.Extensions/Grpc/GrpcRequest.cs b/ServiceStack/src/ServiceStack.Extensions/Grpc/GrpcRequest.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Net;
 using System.Security.Claims;
+using System.Threading;
 using System.Threading.Tasks;
 using Grpc.Core;
 using Microsoft.Extensions.DependencyInjection;
@@ -155,6 +156,8 @@ public string GetHeader(string headerName)
 
     public IRequestPreferences RequestPreferences => requestPreferences ??= new RequestPreferences(this);
 
+    public CancellationToken RequestAborted => Context.CancellationToken;
+
     public string ContentType { get; set; }
 
     public bool IsLocal { get; private set; }
diff --git a/ServiceStack/src/ServiceStack.Interfaces/Web/IRequest.cs b/ServiceStack/src/ServiceStack.Interfaces/Web/IRequest.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using ServiceStack.Configuration;
 
@@ -180,4 +181,9 @@ public interface IRequest : IResolver, IServiceProvider
     /// The value of the Referrer, null if not available
     /// </summary>
     Uri UrlReferrer { get; }
+    
+    /// <summary>
+    /// Notifies when the connection underlying this request is aborted and thus request operations should be cancelled.
+    /// </summary>
+    CancellationToken RequestAborted { get; }
 }
diff --git a/ServiceStack/src/ServiceStack/Host/AspNet/AspNetRequest.cs b/ServiceStack/src/ServiceStack/Host/AspNet/AspNetRequest.cs
@@ -1,6 +1,7 @@
 
 
 using System.Security.Claims;
+using System.Threading;
 using System.Threading.Tasks;
 #if !NETCORE
 
@@ -78,6 +79,8 @@ public AspNetRequest(HttpContextBase httpContext, string operationName, RequestA
 
     public IHttpResponse HttpResponse => response;
 
+    public CancellationToken RequestAborted => CancellationToken.None;
+
     public ClaimsPrincipal User => request.RequestContext?.HttpContext.User as ClaimsPrincipal;
 
     public RequestAttributes RequestAttributes { get; set; }
diff --git a/ServiceStack/src/ServiceStack/Host/BasicHttpRequest.cs b/ServiceStack/src/ServiceStack/Host/BasicHttpRequest.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Net;
+using System.Threading;
 using ServiceStack.Web;
 
 namespace ServiceStack.Host;
diff --git a/ServiceStack/src/ServiceStack/Host/BasicRequest.cs b/ServiceStack/src/ServiceStack/Host/BasicRequest.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Net;
 using System.Security.Claims;
+using System.Threading;
 using System.Threading.Tasks;
 using ServiceStack.Configuration;
 using ServiceStack.IO;
@@ -22,6 +23,7 @@ public class BasicRequest : IRequest, IHasResolver, IHasVirtualFiles, IHasClaims
     public IMessage Message { get; set; }
     public object OriginalRequest { get; protected set; }
     public IResponse Response { get; set; }
+    public CancellationToken RequestAborted => CancellationToken.None;
     
 #if NETCORE
     public Microsoft.Extensions.DependencyInjection.IServiceScope ServiceScope { get; set; }
diff --git a/ServiceStack/src/ServiceStack/Host/HttpListener/ListenerRequest.cs b/ServiceStack/src/ServiceStack/Host/HttpListener/ListenerRequest.cs
@@ -1,6 +1,7 @@
 
 
 using System.Security.Claims;
+using System.Threading;
 using System.Threading.Tasks;
 #if !NETCORE 
 
@@ -76,6 +77,8 @@ private string GetPathInfo()
 
     public IHttpResponse HttpResponse => response;
 
+    public CancellationToken RequestAborted => CancellationToken.None;
+
     public ClaimsPrincipal User => httpContext.User as ClaimsPrincipal;
     public RequestAttributes RequestAttributes { get; set; }
 
diff --git a/ServiceStack/src/ServiceStack/Host/NetCore/NetCoreRequest.cs b/ServiceStack/src/ServiceStack/Host/NetCore/NetCoreRequest.cs
@@ -1,6 +1,7 @@
 ﻿
 
 using System.Security.Claims;
+using System.Threading;
 using System.Threading.Tasks;
 #if NETCORE
 using System;
@@ -67,6 +68,7 @@ public T TryResolve<T>()
 
     private IResponse response;
     public IResponse Response => response ??= new NetCoreResponse(this, context.Response);
+    public CancellationToken RequestAborted => context.RequestAborted;
 
     public string OperationName { get; set; }
     public string Verb => HttpMethod;
diff --git a/ServiceStack/src/ServiceStack/Testing/MockHttpRequest.cs b/ServiceStack/src/ServiceStack/Testing/MockHttpRequest.cs
@@ -3,6 +3,7 @@
 using System.Collections.Specialized;
 using System.IO;
 using System.Net;
+using System.Threading;
 using System.Threading.Tasks;
 using ServiceStack.Configuration;
 using ServiceStack.Host;
@@ -56,6 +57,8 @@ public MockHttpRequest(string operationName, string httpMethod,
 
     public IResponse Response { get; }
 
+    public CancellationToken RequestAborted => CancellationToken.None;
+
     public T TryResolve<T>()
     {
 #if NETCORE
diff --git a/ServiceStack/tests/ServiceStack.ServiceHost.Tests/HttpRequestMock.cs b/ServiceStack/tests/ServiceStack.ServiceHost.Tests/HttpRequestMock.cs
@@ -3,6 +3,7 @@
 using System.Collections.Specialized;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using ServiceStack.Web;
 
@@ -13,6 +14,7 @@ class HttpRequestMock : IHttpRequest
     public object OriginalRequest => throw new NotImplementedException();
 
     public IResponse Response { get; private set; }
+    public CancellationToken RequestAborted => CancellationToken.None;
 
     public string OperationName { get; set; }
 
diff --git a/ServiceStack/tests/ServiceStack.ServiceHost.Tests/ServiceStackHandlerUrlTests.cs b/ServiceStack/tests/ServiceStack.ServiceHost.Tests/ServiceStackHandlerUrlTests.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using ServiceStack.Text;
@@ -32,6 +33,7 @@ public MockUrlHttpRequest(string mode, string path, string rawUrl)
         }
 
         public object OriginalRequest => throw new NotImplementedException();
+        public CancellationToken RequestAborted => CancellationToken.None;
 
         public IResponse Response { get; private set; }
 
