Skip to content

Commit 5b657c6

Browse files
Executor-ChengExecutor-Cheng
committed
v1.0.0.1:
Update builder to support more ways. Let builder support base parser registration. Perform code cleanup.
1 parent 40b1855 commit 5b657c6

File tree

49 files changed

+462
-104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+462
-104
lines changed

‎.editorconfig

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
2+
###############################
3+
# Core EditorConfig Options #
4+
###############################
5+
# All files
6+
[*]
7+
root = true
8+
charset = utf-8
9+
indent_size = 4
10+
indent_style = space
11+
end_of_line = lf
12+
insert_final_newline = true
13+
trim_trailing_whitespace = true
14+
[*.csproj]
15+
indent_size = 2
16+
# Code files
17+
[*.{cs,csx,vb,vbx}]
18+
indent_size = 4
19+
###############################
20+
# .NET Coding Conventions #
21+
###############################
22+
[*.{cs,vb}]
23+
# Organize usings
24+
dotnet_sort_system_directives_first = true
25+
# this. preferences
26+
dotnet_style_qualification_for_field = false:silent
27+
dotnet_style_qualification_for_property = false:silent
28+
dotnet_style_qualification_for_method = false:silent
29+
dotnet_style_qualification_for_event = false:silent
30+
# Language keywords vs BCL types preferences
31+
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
32+
dotnet_style_predefined_type_for_member_access = true:silent
33+
# Parentheses preferences
34+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
35+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
36+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
37+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
38+
# Modifier preferences
39+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
40+
dotnet_style_readonly_field = true:suggestion
41+
# Expression-level preferences
42+
dotnet_style_object_initializer = true:suggestion
43+
dotnet_style_collection_initializer = true:suggestion
44+
dotnet_style_explicit_tuple_names = true:suggestion
45+
dotnet_style_null_propagation = true:suggestion
46+
dotnet_style_coalesce_expression = true:suggestion
47+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
48+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
49+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
50+
dotnet_style_prefer_auto_properties = true:silent
51+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
52+
dotnet_style_prefer_conditional_expression_over_return = true:silent
53+
###############################
54+
# Naming Conventions #
55+
###############################
56+
# Style Definitions
57+
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
58+
# Use PascalCase for constant fields
59+
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
60+
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
61+
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
62+
dotnet_naming_symbols.constant_fields.applicable_kinds = field
63+
dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
64+
dotnet_naming_symbols.constant_fields.required_modifiers = const
65+
###############################
66+
# C# Coding Conventions #
67+
###############################
68+
[*.cs]
69+
# var preferences
70+
csharp_style_var_for_built_in_types = true:silent
71+
csharp_style_var_when_type_is_apparent = true:silent
72+
csharp_style_var_elsewhere = true:silent
73+
# Expression-bodied members
74+
csharp_style_expression_bodied_methods = false:silent
75+
csharp_style_expression_bodied_constructors = false:silent
76+
csharp_style_expression_bodied_operators = false:silent
77+
csharp_style_expression_bodied_properties = true:silent
78+
csharp_style_expression_bodied_indexers = true:silent
79+
csharp_style_expression_bodied_accessors = true:silent
80+
# Pattern matching preferences
81+
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
82+
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
83+
# Null-checking preferences
84+
csharp_style_throw_expression = true:suggestion
85+
csharp_style_conditional_delegate_call = true:suggestion
86+
# Modifier preferences
87+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
88+
# Expression-level preferences
89+
csharp_prefer_braces = true:silent
90+
csharp_style_deconstructed_variable_declaration = true:suggestion
91+
csharp_prefer_simple_default_expression = true:suggestion
92+
csharp_style_pattern_local_over_anonymous_function = true:suggestion
93+
csharp_style_inlined_variable_declaration = true:suggestion
94+
###############################
95+
# C# Formatting Rules #
96+
###############################
97+
# New line preferences
98+
csharp_new_line_before_open_brace = all
99+
csharp_new_line_before_else = true
100+
csharp_new_line_before_catch = true
101+
csharp_new_line_before_finally = true
102+
csharp_new_line_before_members_in_object_initializers = true
103+
csharp_new_line_before_members_in_anonymous_types = true
104+
csharp_new_line_between_query_expression_clauses = true
105+
# Indentation preferences
106+
csharp_indent_case_contents = true
107+
csharp_indent_switch_labels = true
108+
csharp_indent_labels = flush_left
109+
# Space preferences
110+
csharp_space_after_cast = false
111+
csharp_space_after_keywords_in_control_flow_statements = true
112+
csharp_space_between_method_call_parameter_list_parentheses = false
113+
csharp_space_between_method_declaration_parameter_list_parentheses = false
114+
csharp_space_between_parentheses = false
115+
csharp_space_before_colon_in_inheritance_clause = true
116+
csharp_space_after_colon_in_inheritance_clause = true
117+
csharp_space_around_binary_operators = before_and_after
118+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
119+
csharp_space_between_method_call_name_and_opening_parenthesis = false
120+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
121+
# Wrapping preferences
122+
csharp_preserve_single_line_statements = true
123+
csharp_preserve_single_line_blocks = true
124+
###############################
125+
# Code Analysis Config #
126+
###############################
127+
128+
# CA1031: Do not catch general exception types
129+
dotnet_diagnostic.CA1031.severity = none
130+
131+
###############################
132+
# VB Coding Conventions #
133+
###############################
134+
135+
[*.vb]
136+
# Modifier preferences
137+
visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion

‎Directory.Build.props

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<Authors>Executor</Authors>
88
<Company>Executor</Company>
9+
<Version>1.0.0.1</Version>
10+
<AssemblyVersion>1.0.0.1</AssemblyVersion>
11+
<FileVersion>1.0.0.1</FileVersion>
912
<Copyright>Copyright © Executor 2021</Copyright>
1013
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1114
<PackageProjectUrl>https://github.com/Executor-Cheng/Executorlibs</PackageProjectUrl>
@@ -16,6 +19,6 @@
1619
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1720
<PublishDocumentationFile>true</PublishDocumentationFile>
1821
<PublishReferencesDocumentationFiles>true</PublishReferencesDocumentationFiles>
19-
<NoWarn>1701;1702;1591</NoWarn>
22+
<NoWarn>1701;1702;1573;1591;</NoWarn>
2023
</PropertyGroup>
2124
</Project>

‎Executorlibs.sln

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,21 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.31229.75
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Executorlibs.Examples", "src\Executorlibs.Examples\Executorlibs.Examples.csproj", "{AF66A533-AEC8-4E4D-93C6-EF3E736C723D}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Executorlibs.Examples", "src\Executorlibs.Examples\Executorlibs.Examples.csproj", "{AF66A533-AEC8-4E4D-93C6-EF3E736C723D}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Executorlibs.MessageFramework", "src\Executorlibs.MessageFramework\Executorlibs.MessageFramework.csproj", "{A7E6B85C-0AA8-41F4-B3D0-E62BC33E3A08}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Executorlibs.MessageFramework", "src\Executorlibs.MessageFramework\Executorlibs.MessageFramework.csproj", "{A7E6B85C-0AA8-41F4-B3D0-E62BC33E3A08}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Executorlibs.Bilibili.Protocol", "src\Executorlibs.Bilibili.Protocol\Executorlibs.Bilibili.Protocol.csproj", "{63F1C21C-303C-4A15-B95E-2B8463A71984}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Executorlibs.Bilibili.Protocol", "src\Executorlibs.Bilibili.Protocol\Executorlibs.Bilibili.Protocol.csproj", "{63F1C21C-303C-4A15-B95E-2B8463A71984}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Executorlibs.Shared.Protocol", "src\Executorlibs.Shared.Protocol\Executorlibs.Shared.Protocol.csproj", "{6F28FE90-5659-4041-980B-38676003D3B9}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Executorlibs.Shared.Protocol", "src\Executorlibs.Shared.Protocol\Executorlibs.Shared.Protocol.csproj", "{6F28FE90-5659-4041-980B-38676003D3B9}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Executorlibs.Shared", "src\Executorlibs.Shared\Executorlibs.Shared.csproj", "{085451E3-E7F7-44D5-B04F-8402A357361B}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Executorlibs.Shared", "src\Executorlibs.Shared\Executorlibs.Shared.csproj", "{085451E3-E7F7-44D5-B04F-8402A357361B}"
15+
EndProject
16+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1AEE6EE5-EE11-4370-B057-69525F675C89}"
17+
ProjectSection(SolutionItems) = preProject
18+
.editorconfig = .editorconfig
19+
Directory.Build.props = Directory.Build.props
20+
EndProjectSection
1521
EndProject
1622
Global
1723
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎src/Executorlibs.Bilibili.Protocol/Builders/BilibiliDanmakuFrameworkBuilder.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
using System;
2+
using System.Reflection;
3+
using System.Text.Json;
14
using Executorlibs.Bilibili.Protocol.Clients;
25
using Executorlibs.Bilibili.Protocol.Handlers;
36
using Executorlibs.Bilibili.Protocol.Invokers;
@@ -8,9 +11,6 @@
811
using Executorlibs.Bilibili.Protocol.Services;
912
using Executorlibs.MessageFramework.Builders;
1013
using Microsoft.Extensions.DependencyInjection;
11-
using System;
12-
using System.Reflection;
13-
using System.Text.Json;
1414

1515
namespace Executorlibs.Bilibili.Protocol.Builders
1616
{

‎src/Executorlibs.Bilibili.Protocol/Clients/DanmakuClientBase.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
using System;
2-
using System.Buffers;
32
using System.Buffers.Binary;
43
using System.Diagnostics;
54
using System.IO;
6-
using System.IO.Compression;
75
using System.Runtime.CompilerServices;
86
using System.Runtime.InteropServices;
97
using System.Text;
@@ -82,7 +80,7 @@ protected static byte[] CreatePayload(int action, byte[] body)
8280

8381
public int RoomId => _Options.RoomId;
8482

85-
protected CancellationTokenSource? _Cts = new CancellationTokenSource();
83+
protected CancellationTokenSource? _Cts = new();
8684

8785
protected CancellationTokenSource? _WorkerCts;
8886

@@ -281,7 +279,7 @@ private async void ReceiveMessageAsyncLoop(TaskCompletionSource<int> tcs, Cancel
281279
}
282280
catch // 失败了关我啥事儿
283281
{
284-
282+
285283
}
286284
}
287285
else

‎src/Executorlibs.Bilibili.Protocol/Clients/TcpDanmakuClientBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ protected override async Task InternalConnectAsync(CancellationToken token)
5757
#else
5858
await socket.ConnectAsync(serverHost.Host, serverHost.Port);
5959
#endif
60-
await SendJoinRoomAsync(socket, roomId, 0,server.Token, token);
60+
await SendJoinRoomAsync(socket, roomId, 0, server.Token, token);
6161
_Socket = socket;
6262
}
6363

6464
protected override void InternalDisconnect()
6565
{
66-
66+
6767
}
6868

6969
protected override void InternalDispose(bool disposing)

‎src/Executorlibs.Bilibili.Protocol/Clients/TcpDanmakuClientV2.cs

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,31 @@
1+
2+
/* Unmerged change from project 'Executorlibs.Bilibili.Protocol (net5.0)'
3+
Before:
14
using Executorlibs.Bilibili.Protocol.Invokers;
2-
using Executorlibs.Bilibili.Protocol.Options;
3-
using Executorlibs.Bilibili.Protocol.Services;
4-
using Microsoft.Extensions.Options;
5+
After:
6+
using System;
7+
using System.Buffers;
8+
using System.IO;
9+
using System.IO.Compression;
10+
using Executorlibs.Bilibili.Protocol.Invokers;
11+
*/
12+
13+
/* Unmerged change from project 'Executorlibs.Bilibili.Protocol (netstandard2.1)'
14+
Before:
15+
using Executorlibs.Bilibili.Protocol.Invokers;
16+
After:
517
using System;
618
using System.Buffers;
719
using System.IO;
820
using System.IO.Compression;
21+
using Executorlibs.Bilibili.Protocol.Invokers;
22+
*/
23+
using System.IO;
24+
using System.IO.Compression;
25+
using Executorlibs.Bilibili.Protocol.Invokers;
26+
using Executorlibs.Bilibili.Protocol.Options;
27+
using Executorlibs.Bilibili.Protocol.Services;
28+
using Microsoft.Extensions.Options;
929

1030
namespace Executorlibs.Bilibili.Protocol.Clients
1131
{

‎src/Executorlibs.Bilibili.Protocol/Clients/TcpDanmakuClientV3.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using Executorlibs.Bilibili.Protocol.Invokers;
1+
using System;
2+
using System.Buffers;
3+
using System.IO.Compression;
4+
using Executorlibs.Bilibili.Protocol.Invokers;
25
using Executorlibs.Bilibili.Protocol.Options;
36
using Executorlibs.Bilibili.Protocol.Services;
47
using Microsoft.Extensions.Options;
5-
using System;
6-
using System.Buffers;
7-
using System.IO.Compression;
88

99
namespace Executorlibs.Bilibili.Protocol.Clients
1010
{

‎src/Executorlibs.Bilibili.Protocol/Clients/WsDanmakuClientBase.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1+
using System;
2+
using System.Diagnostics;
3+
using System.Net.WebSockets;
4+
using System.Threading;
5+
using System.Threading.Tasks;
16
using Executorlibs.Bilibili.Protocol.Invokers;
27
using Executorlibs.Bilibili.Protocol.Models;
38
using Executorlibs.Bilibili.Protocol.Options;
49
using Executorlibs.Bilibili.Protocol.Services;
510
using Executorlibs.Shared.Extensions;
611
using Microsoft.Extensions.Options;
7-
using System;
8-
using System.Diagnostics;
9-
using System.Net.WebSockets;
10-
using System.Threading;
11-
using System.Threading.Tasks;
1212

1313
namespace Executorlibs.Bilibili.Protocol.Clients
1414
{
@@ -70,12 +70,12 @@ protected ValueTask SendJoinRoomAsync(WebSocket client, int roomId, int userId,
7070

7171
protected override void InternalDisconnect()
7272
{
73-
73+
7474
}
7575

7676
protected override void InternalDispose(bool disposing)
7777
{
78-
78+
7979
}
8080
}
8181
}

‎src/Executorlibs.Bilibili.Protocol/Clients/WsDanmakuClientV2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.IO;
1+
using System.IO;
22
using System.IO.Compression;
33
using Executorlibs.Bilibili.Protocol.Invokers;
44
using Executorlibs.Bilibili.Protocol.Options;

0 commit comments

Comments
 (0)