Skip to content

Commit

Permalink
更新 Pek.Common 包版本并重构 WebHelper 相关代码
Browse files Browse the repository at this point in the history 
更新了 `Pek.Common` 包的版本至 `4.0.2024.1122-beta0142`。
在 `CalculateExecutionTimeMiddleware.cs` 文件中：
  - 添加了对 `Pek.Webs` 命名空间的引用。
  - 增加了 `_webHelper` 字段，并在构造函数中初始化。
  - 修改了构造函数，增加了 `IWebHelper` 参数。
  - 在 `Invoke` 方法中，将对静态资源的检查从 `WebHelperEx.IsStaticResource` 改为 `_webHelper.IsStaticResource`。
在 `WebHelperEx.cs` 文件中：
  - 删除了 `WebHelperEx` 类的实现代码，并将其注释掉。
在 `IWebHelper.cs` 文件中：
  - 添加了 `IWebHelper` 接口，定义了多个与网页助手相关的方法和属性。
  • Loading branch information
猿人易 committed Nov 22, 2024
1 parent 22939ca commit 4b1aeeb
Show file tree
Hide file tree
Showing 4 changed files with 206 additions and 100 deletions.
2 changes: 1 addition & 1 deletion Pek.AspNetCore/Pek.AspNetCore.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Pek.Common" Version="4.0.2024.1121-beta0139" />
<PackageReference Include="Pek.Common" Version="4.0.2024.1122-beta0142" />
</ItemGroup>

<ItemGroup>
Expand Down
15 changes: 12 additions & 3 deletions Pek.AspNetCore/WebMiddleware/CalculateExecutionTimeMiddleware.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

using NewLife.Log;

using Pek.Webs;

namespace Pek.WebMiddleware;

/// <summary>
Expand All @@ -11,19 +13,26 @@ public class CalculateExecutionTimeMiddleware
{
private readonly RequestDelegate _next; //下一个中间件
Stopwatch? stopwatch;
private readonly IWebHelper _webHelper;

/// <summary>
/// 实例化
/// </summary>
/// <param name="next"></param>
public CalculateExecutionTimeMiddleware(RequestDelegate next) => _next = next ?? throw new ArgumentNullException(nameof(next));
/// <param name="webHelper"></param>
public CalculateExecutionTimeMiddleware(RequestDelegate next, IWebHelper webHelper)
{
_next = next ?? throw new ArgumentNullException(nameof(next));

_webHelper = webHelper;
}

/// <summary>
/// 调用
/// </summary>
/// <param name="ctx"></param>
/// <returns></returns>
public async Task Invoke(HttpContext ctx)
public async Task Invoke(Microsoft.AspNetCore.Http.HttpContext ctx)
{
if (ctx.WebSockets.IsWebSocketRequest)
{
Expand All @@ -32,7 +41,7 @@ public async Task Invoke(HttpContext ctx)
}

// 检查是否为静态资源
if (WebHelperEx.IsStaticResource(ctx))
if (_webHelper.IsStaticResource(ctx))
{
await _next.Invoke(ctx);
return;
Expand Down
121 changes: 121 additions & 0 deletions Pek.AspNetCore/Webs/IWebHelper.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
namespace Pek.Webs;

/// <summary>
/// 表示一个网页助手
/// </summary>
public partial interface IWebHelper
{
/// <summary>
/// 如果存在，获取 URL 来源
/// </summary>
/// <returns>URL 访问者</returns>
String? GetUrlReferrer();

/// <summary>
/// 从 HTTP 上下文中获取 IP 地址
/// </summary>
/// <returns>IP 地址字符串</returns>
String GetCurrentIpAddress();

/// <summary>
/// 获取当前页面的 URL
/// </summary>
/// <param name="includeQueryString">表示是否包括查询字符串的值</param>
/// <param name="useSsl">表示是否获取 SSL 安全页面 URL 的值。传递 null 以自动确定</param>
/// <param name="lowercaseUrl">表示是否将 URL 转换为小写</param>
/// <returns>页面 URL</returns>
String GetThisPageUrl(Boolean includeQueryString, Boolean? useSsl = null, Boolean lowercaseUrl = false);

/// <summary>
/// 获取一个值，表示当前连接是否安全
/// </summary>
/// <returns>如果它是安全的，则返回真，否则返回假</returns>
Boolean IsCurrentConnectionSecured();

/// <summary>
/// 获取商店主机位置
/// </summary>
/// <param name="useSsl">是否获取 SSL 安全的 URL</param>
/// <returns>存储主机位置</returns>
String GetStoreHost(Boolean useSsl);

/// <summary>
/// 获取商店位置
/// </summary>
/// <param name="useSsl">是否获取 SSL 安全的 URL；传递 null 以自动决定</param>
/// <returns>存储位置</returns>
String GetStoreLocation(Boolean? useSsl = null);

/// <summary>
/// 如果请求的资源是不需要 CMS 引擎处理的典型资源之一，则返回 true。
/// </summary>
/// <returns>如果请求针对的是静态资源文件，则返回真。</returns>
Boolean IsStaticResource(Microsoft.AspNetCore.Http.HttpContext? httpContext = null);

/// <summary>
/// 修改 URL 的查询字符串
/// </summary>
/// <param name="url">要修改的网址</param>
/// <param name="key">要添加的查询参数键</param>
/// <param name="values">要添加的查询参数值</param>
/// <returns>包含传递查询参数的新 URL</returns>
String ModifyQueryString(String url, String key, params String[] values);

/// <summary>
/// 从 URL 中移除查询参数
/// </summary>
/// <param name="url">要修改的 URL</param>
/// <param name="key">要删除的查询参数键</param>
/// <param name="value">要删除的查询参数值；传递 null 以删除具有指定键的所有查询参数</param>
/// <returns>不包含传递查询参数的新 URL</returns>
String RemoveQueryString(String url, String key, String? value = null);

/// <summary>
/// 通过名称获取查询字符串值
/// </summary>
/// <typeparam name="T">返回值类型</typeparam>
/// <param name="name">查询参数名称</param>
/// <returns>查询字符串值</returns>
T QueryString<T>(String name);

/// <summary>
/// 重启应用程序域
/// </summary>
void RestartAppDomain();

/// <summary>
/// 获取一个值，表示客户端是否被重定向到新的位置
/// </summary>
Boolean IsRequestBeingRedirected { get; }

/// <summary>
/// 获取或设置一个值，指示客户端是否正在使用 POST 重定向到新位置
/// </summary>
Boolean IsPostBeingDone { get; set; }

/// <summary>
/// 获取当前 HTTP 请求协议
/// </summary>
String GetCurrentRequestProtocol();

/// <summary>
/// 判断指定的 HTTP 请求 URI 是否引用了本地主机。
/// </summary>
/// <param name="req">HTTP 请求</param>
/// <returns>如果 HTTP 请求 URI 引用到本地主机，则返回 True</returns>
Boolean IsLocalRequest(HttpRequest req);

/// <summary>
/// 获取请求的原始路径和完整查询
/// </summary>
/// <param name="request">HTTP 请求</param>
/// <returns>原始 URL</returns>
String GetRawUrl(HttpRequest request);

/// <summary>
/// 判断请求是否使用了 AJAX
/// </summary>
/// <param name="request">HTTP 请求</param>
/// <returns>结果</returns>
Boolean IsAjaxRequest(HttpRequest request);
}
168 changes: 72 additions & 96 deletions Pek.AspNetCore/Webs/WebHelperEx.cs
View file
Original file line number Diff line number Diff line change
@@ -1,96 +1,72 @@
using Microsoft.AspNetCore.StaticFiles;

using NewLife;

namespace Pek;

public partial class WebHelperEx
{
private static readonly IHttpContextAccessor _httpContextAccessor;

static WebHelperEx()
{
_httpContextAccessor = Pek.Webs.HttpContext.Current.RequestServices.GetRequiredService<IHttpContextAccessor>();
}

/// <summary>
/// 如果请求的资源是引擎不需要处理的典型资源之一，则返回true。
/// </summary>
/// <returns>如果请求针对静态资源文件，则为True。</returns>
public static Boolean IsStaticResource(HttpContext? httpContext = null)
{
if (!IsRequestAvailable(httpContext))
return false;

var path = httpContext?.Request.Path ?? _httpContextAccessor.HttpContext?.Request.Path;
if (path == null)
{
return false;
}

var extension = GetExtension(path);
if (extension.IsNullOrEmpty())
{
return false;
}

// 直接初始化 HashSet，使用 StringComparer.OrdinalIgnoreCase 以支持不区分大小写的比较
var staticExtensions = new HashSet<String>([".map", ".css"], StringComparer.OrdinalIgnoreCase);

if (staticExtensions.Contains(extension))
{
return true;
}

// 一些解决方法。 FileExtensionContentTypeProvider包含大多数静态文件扩展名。 所以我们可以使用它
// 参考: https://github.com/aspnet/StaticFiles/blob/dev/src/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs
// 如果可以返回内容类型，则为静态文件
var contentTypeProvider = new FileExtensionContentTypeProvider();
return contentTypeProvider.TryGetContentType(path, out _);
}


/// <summary>
/// 检查当前HTTP请求是否可用
/// </summary>
/// <returns>如果可用，则为true；否则为true。 否则为假</returns>
public static Boolean IsRequestAvailable(HttpContext? httpContext = null)
{
if (httpContext != null) return true;

if (_httpContextAccessor?.HttpContext == null)
return false;

try
{
if (_httpContextAccessor.HttpContext.Request == null)
return false;
}
catch (Exception)
{
return false;
}

return true;
}

private static String? GetExtension(String? path)
{
// Don't use Path.GetExtension as that may throw an exception if there are
// invalid characters in the path. Invalid characters should be handled
// by the FileProviders

if (path.IsNullOrWhiteSpace())
{
return null;
}

var index = path.LastIndexOf('.');
if (index < 0)
{
return null;
}

return path[index..];
}
}
//using Microsoft.AspNetCore.StaticFiles;

//using NewLife;

//namespace Pek;

//public partial class WebHelperEx
//{
// private static readonly IHttpContextAccessor _httpContextAccessor;

// static WebHelperEx()
// {
// _httpContextAccessor = Pek.Webs.HttpContext.Current.RequestServices.GetRequiredService<IHttpContextAccessor>();
// }

// /// <summary>
// /// 如果请求的资源是引擎不需要处理的典型资源之一，则返回true。
// /// </summary>
// /// <returns>如果请求针对静态资源文件，则为True。</returns>
// public static Boolean IsStaticResource(HttpContext? httpContext = null)
// {
// if (!IsRequestAvailable(httpContext))
// return false;

// var path = httpContext?.Request.Path ?? _httpContextAccessor.HttpContext?.Request.Path;
// if (path == null)
// {
// return false;
// }

// var extension = GetExtension(path);
// if (extension.IsNullOrEmpty())
// {
// return false;
// }

// // 直接初始化 HashSet，使用 StringComparer.OrdinalIgnoreCase 以支持不区分大小写的比较
// var staticExtensions = new HashSet<String>([".map", ".css"], StringComparer.OrdinalIgnoreCase);

// if (staticExtensions.Contains(extension))
// {
// return true;
// }

// // 一些解决方法。 FileExtensionContentTypeProvider包含大多数静态文件扩展名。 所以我们可以使用它
// // 参考: https://github.com/aspnet/StaticFiles/blob/dev/src/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs
// // 如果可以返回内容类型，则为静态文件
// var contentTypeProvider = new FileExtensionContentTypeProvider();
// return contentTypeProvider.TryGetContentType(path, out _);
// }


// private static String? GetExtension(String? path)
// {
// // Don't use Path.GetExtension as that may throw an exception if there are
// // invalid characters in the path. Invalid characters should be handled
// // by the FileProviders

// if (path.IsNullOrWhiteSpace())
// {
// return null;
// }

// var index = path.LastIndexOf('.');
// if (index < 0)
// {
// return null;
// }

// return path[index..];
// }
//}

0 comments on commit 4b1aeeb

Please sign in to comment.