Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
IoTSharp
提交
349d9d77
I
IoTSharp
项目概览
jobily
/
IoTSharp
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
IoTSharp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
349d9d77
编写于
6月 24, 2019
作者:
麦壳饼
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add retained message table
上级
ff6f05a1
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
162 addition
and
12 deletion
+162
-12
IoTSharp/AppSettings.cs
IoTSharp/AppSettings.cs
+1
-0
IoTSharp/Data/ApplicationDbContext.cs
IoTSharp/Data/ApplicationDbContext.cs
+2
-0
IoTSharp/Data/RetainedMessage.cs
IoTSharp/Data/RetainedMessage.cs
+48
-0
IoTSharp/Data/RetainedMessageHandler.cs
IoTSharp/Data/RetainedMessageHandler.cs
+70
-0
IoTSharp/Extensions/MqttExtension.cs
IoTSharp/Extensions/MqttExtension.cs
+3
-2
IoTSharp/Handlers/MQTTService.cs
IoTSharp/Handlers/MQTTService.cs
+30
-1
IoTSharp/IoTSharp.csproj
IoTSharp/IoTSharp.csproj
+1
-1
IoTSharp/Startup.cs
IoTSharp/Startup.cs
+7
-8
未找到文件。
IoTSharp/AppSettings.cs
浏览文件 @
349d9d77
...
...
@@ -40,5 +40,6 @@ namespace IoTSharp
public
bool
EnableTls
{
get
;
set
;
}
=
false
;
public
string
Certificate
{
get
;
set
;
}
public
SslProtocols
SslProtocol
{
get
;
set
;
}
=
SslProtocols
.
None
;
public
bool
PersistRetainedMessages
{
get
;
internal
set
;
}
}
}
IoTSharp/Data/ApplicationDbContext.cs
浏览文件 @
349d9d77
...
...
@@ -140,5 +140,7 @@ namespace IoTSharp.Data
public
DbSet
<
TelemetryLatest
>
TelemetryLatest
{
get
;
set
;
}
public
DbSet
<
DeviceIdentity
>
DeviceIdentities
{
get
;
set
;
}
public
DbSet
<
AuditLog
>
AuditLog
{
get
;
set
;
}
public
DbSet
<
RetainedMessage
>
RetainedMessage
{
get
;
set
;
}
}
}
\ No newline at end of file
IoTSharp/Data/RetainedMessage.cs
0 → 100644
浏览文件 @
349d9d77
using
MQTTnet
;
using
MQTTnet.Protocol
;
using
System
;
using
System.Collections.Generic
;
using
System.ComponentModel.DataAnnotations
;
using
System.Linq
;
using
System.Security.Cryptography
;
using
System.Threading.Tasks
;
namespace
IoTSharp.Data
{
[
Serializable
]
public
class
RetainedMessage
{
// user-defined conversion from Fraction to double
public
static
implicit
operator
MqttApplicationMessage
(
RetainedMessage
f
)
{
return
new
MqttApplicationMessage
()
{
Payload
=
f
.
Payload
,
Retain
=
true
,
Topic
=
f
.
Topic
,
QualityOfServiceLevel
=
f
.
QualityOfServiceLevel
};
}
public
static
implicit
operator
RetainedMessage
(
MqttApplicationMessage
f
)
{
return
new
RetainedMessage
(
f
);
}
public
byte
[]
Payload
{
get
;
set
;
}
public
MqttQualityOfServiceLevel
QualityOfServiceLevel
{
get
;
set
;
}
public
string
Topic
{
get
;
set
;
}
public
bool
Retain
{
get
;
set
;
}
MD5
MD5
=
MD5
.
Create
();
public
RetainedMessage
()
{
}
public
RetainedMessage
(
MqttApplicationMessage
retained
)
{
Topic
=
retained
.
Topic
;
QualityOfServiceLevel
=
retained
.
QualityOfServiceLevel
;
Payload
=
retained
.
Payload
;
Retain
=
retained
.
Retain
;
List
<
byte
>
lst
=
new
List
<
byte
>(
Payload
);
lst
.
AddRange
(
System
.
Text
.
Encoding
.
UTF8
.
GetBytes
(
Topic
));
Id
=
BitConverter
.
ToString
(
MD5
.
ComputeHash
(
lst
.
ToArray
())).
Replace
(
"-"
,
""
);
}
[
Key
]
public
string
Id
{
get
;
set
;
}
}
}
IoTSharp/Data/RetainedMessageHandler.cs
0 → 100644
浏览文件 @
349d9d77
using
Microsoft.EntityFrameworkCore
;
using
Microsoft.Extensions.Logging
;
using
MQTTnet
;
using
MQTTnet.Server
;
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Threading
;
using
System.Threading.Tasks
;
namespace
IoTSharp.Data
{
public
class
RetainedMessageHandler
:
IMqttServerStorage
{
private
ApplicationDbContext
_context
;
private
ILogger
_logger
;
public
RetainedMessageHandler
(
ILogger
<
RetainedMessageHandler
>
logger
,
ApplicationDbContext
context
)
{
_context
=
context
;
_logger
=
logger
;
}
public
async
Task
<
IList
<
MqttApplicationMessage
>>
LoadRetainedMessagesAsync
()
{
await
Task
.
CompletedTask
;
try
{
var
lst
=
from
m
in
_context
.
RetainedMessage
select
(
MqttApplicationMessage
)
m
;
return
await
lst
.
ToListAsync
();
}
catch
(
Exception
ex
)
{
_logger
.
LogError
(
ex
,
$"load RetainedMessage error
{
ex
.
Message
}
"
);
return
new
List
<
MqttApplicationMessage
>();
}
}
public
Task
SaveRetainedMessagesAsync
(
IList
<
MqttApplicationMessage
>
messages
)
{
Task
.
Factory
.
StartNew
(()
=>
{
_context
.
Database
.
BeginTransaction
();
try
{
DateTime
dateTime
=
DateTime
.
Now
;
var
needsave
=
from
mam
in
messages
select
new
RetainedMessage
(
mam
);
var
ids
=
needsave
.
Select
(
x
=>
x
.
Id
).
ToList
();
var
dbids
=
_context
.
RetainedMessage
.
Select
(
x
=>
x
.
Id
).
ToArray
();
var
needdelete
=
dbids
.
Except
(
ids
);
//.Except(dbids);
var
del
=
from
f
in
_context
.
RetainedMessage
where
needdelete
.
Contains
(
f
.
Id
)
select
f
;
var
needadd
=
ids
.
Except
(
dbids
);
var
add
=
from
f
in
needsave
where
needadd
.
Contains
(
f
.
Id
)
select
f
;
if
(
del
.
Any
())
_context
.
RetainedMessage
.
RemoveRange
(
del
);
if
(
add
.
Any
())
_context
.
RetainedMessage
.
AddRange
(
add
);
int
ret
=
_context
.
SaveChanges
();
_context
.
Database
.
CommitTransaction
();
_logger
.
LogInformation
(
$"
{
ret
}
pieces of data were saved and took
{
DateTime
.
Now
.
Subtract
(
dateTime
).
TotalSeconds
}
seconds."
);
}
catch
(
Exception
ex
)
{
_context
.
Database
.
RollbackTransaction
();
_logger
.
LogError
(
ex
,
$" An exception was encountered,
{
ex
.
Message
}
"
);
}
},
CancellationToken
.
None
,
TaskCreationOptions
.
DenyChildAttach
,
TaskScheduler
.
Default
);
return
Task
.
CompletedTask
;
}
}
}
\ No newline at end of file
IoTSharp/Extensions/MqttExtension.cs
浏览文件 @
349d9d77
...
...
@@ -14,6 +14,7 @@ using IoTSharp.Services;
using
MQTTnet.Server
;
using
MQTTnet.Client.Receiving
;
using
MQTTnet.Client.Options
;
using
IoTSharp.MQTT
;
namespace
IoTSharp
{
...
...
@@ -22,7 +23,6 @@ namespace IoTSharp
//static private IMqttServer _mqttServer;
public
static
void
AddIoTSharpMqttServer
(
this
IServiceCollection
services
,
MqttBrokerSetting
setting
)
{
services
.
AddMqttTcpServerAdapter
();
services
.
AddHostedMqttServerEx
(
options
=>
{
...
...
@@ -42,6 +42,7 @@ namespace IoTSharp
{
options
.
WithoutEncryptedEndpoint
();
}
options
.
Build
();
});
services
.
AddMqttConnectionHandler
();
...
...
@@ -52,6 +53,7 @@ namespace IoTSharp
{
app
.
UseMqttEndpoint
();
var
mqttEvents
=
app
.
ApplicationServices
.
CreateScope
().
ServiceProvider
.
GetService
<
MqttEventsHandler
>();
IMqttServerStorage
storage
=
app
.
ApplicationServices
.
CreateScope
().
ServiceProvider
.
GetService
<
IMqttServerStorage
>();
app
.
UseMqttServerEx
(
server
=>
{
server
.
ClientConnectedHandler
=
new
MqttServerClientConnectedHandlerDelegate
(
args
=>
mqttEvents
.
Server_ClientConnected
(
server
,
args
));
...
...
@@ -62,7 +64,6 @@ namespace IoTSharp
server
.
ClientUnsubscribedTopicHandler
=
new
MqttServerClientUnsubscribedTopicHandlerDelegate
(
args
=>
mqttEvents
.
Server_ClientUnsubscribedTopic
(
server
,
args
));
server
.
ClientConnectionValidatorHandler
=
new
MqttServerClientConnectionValidatorHandlerDelegate
(
args
=>
mqttEvents
.
Server_ClientConnectionValidator
(
server
,
args
));
server
.
ClientDisconnectedHandler
=
new
MqttServerClientDisconnectedHandlerDelegate
(
args
=>
mqttEvents
.
Server_ClientDisconnected
(
server
,
args
));
});
var
mqttNetLogger
=
app
.
ApplicationServices
.
GetService
<
IMqttNetLogger
>();
...
...
IoTSharp/Handlers/MQTTService.cs
浏览文件 @
349d9d77
using
IoTSharp.Data
;
using
IoTSharp.Diagnostics
;
using
IoTSharp.Extensions
;
using
IoTSharp.MQTT
;
using
IoTSharp.Storage
;
using
IoTSharp.Sys
;
using
IoTSharp.X509Extensions
;
using
Microsoft.EntityFrameworkCore
;
using
Microsoft.Extensions.Logging
;
...
...
@@ -7,6 +11,7 @@ using MQTTnet;
using
MQTTnet.AspNetCoreEx
;
using
MQTTnet.Server
;
using
System
;
using
System.Collections.Concurrent
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Security.Cryptography
;
...
...
@@ -21,11 +26,35 @@ namespace IoTSharp.Handlers
readonly
ILogger
<
MqttEventsHandler
>
_logger
;
readonly
ApplicationDbContext
_dbContext
;
readonly
IMqttServerEx
_serverEx
;
public
MqttEventsHandler
(
ILogger
<
MqttEventsHandler
>
logger
,
ApplicationDbContext
dbContext
,
IMqttServerEx
serverEx
)
private
readonly
BlockingCollection
<
MqttApplicationMessageReceivedEventArgs
>
_incomingMessages
=
new
BlockingCollection
<
MqttApplicationMessageReceivedEventArgs
>();
private
readonly
Dictionary
<
string
,
MqttTopicImporter
>
_importers
=
new
Dictionary
<
string
,
MqttTopicImporter
>();
private
readonly
Dictionary
<
string
,
MqttSubscriber
>
_subscribers
=
new
Dictionary
<
string
,
MqttSubscriber
>();
private
readonly
OperationsPerSecondCounter
_inboundCounter
;
private
readonly
OperationsPerSecondCounter
_outboundCounter
;
private
bool
_enableMqttLogging
;
private
readonly
StorageService
_storageService
;
private
readonly
SystemCancellationToken
_systemCancellationToken
;
public
MqttEventsHandler
(
ILogger
<
MqttEventsHandler
>
logger
,
ApplicationDbContext
dbContext
,
IMqttServerEx
serverEx
,
DiagnosticsService
diagnosticsService
,
StorageService
storageService
,
SystemStatusService
systemStatusService
)
{
_logger
=
logger
;
_dbContext
=
dbContext
;
_serverEx
=
serverEx
;
_inboundCounter
=
diagnosticsService
.
CreateOperationsPerSecondCounter
(
"mqtt.inbound_rate"
);
_outboundCounter
=
diagnosticsService
.
CreateOperationsPerSecondCounter
(
"mqtt.outbound_rate"
);
systemStatusService
.
Set
(
"mqtt.subscribers_count"
,
()
=>
_subscribers
.
Count
);
systemStatusService
.
Set
(
"mqtt.incoming_messages_count"
,
()
=>
_incomingMessages
.
Count
);
systemStatusService
.
Set
(
"mqtt.inbound_rate"
,
()
=>
_inboundCounter
.
Count
);
systemStatusService
.
Set
(
"mqtt.outbound_rate"
,
()
=>
_outboundCounter
.
Count
);
systemStatusService
.
Set
(
"mqtt.connected_clients_count"
,
()
=>
serverEx
.
GetClientStatusAsync
().
GetAwaiter
().
GetResult
().
Count
);
}
static
long
clients
=
0
;
...
...
IoTSharp/IoTSharp.csproj
浏览文件 @
349d9d77
...
...
@@ -56,6 +56,7 @@
<ItemGroup>
<PackageReference Include="CoAP.NET.Core" Version="1.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="2.2.0" />
<PackageReference Include="MQTTnet.AspNetCoreEx" Version="3.0.2.1" />
<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="3.0.2" />
<PackageReference Include="Packaging.Targets" Version="0.1.78" />
...
...
@@ -89,7 +90,6 @@
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
<PackageReference Include="MQTTnet" Version="3.0.2" />
<PackageReference Include="MQTTnet.AspNetCore" Version="3.0.2" />
<PackageReference Include="MQTTnet.AspNetCoreEx" Version="3.0.2" />
<PackageReference Include="MQTTnet.Extensions.Rpc" Version="3.0.2" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.2.4" />
<PackageReference Include="NSwag.AspNetCore" Version="12.3.1" />
...
...
IoTSharp/Startup.cs
浏览文件 @
349d9d77
using
IoTSharp.Data
;
using
IoTSharp.Diagnostics
;
using
IoTSharp.Extensions
;
using
IoTSharp.MQTT
;
using
IoTSharp.Services
;
using
IoTSharp.Storage
;
using
Microsoft.AspNetCore.Authentication.JwtBearer
;
using
Microsoft.AspNetCore.Authorization
;
using
Microsoft.AspNetCore.Builder
;
...
...
@@ -62,7 +64,7 @@ namespace IoTSharp
services
.
AddLogging
(
loggingBuilder
=>
loggingBuilder
.
AddConsole
());
//
services.AddIoTSharpHub(Configuration);
services
.
AddIoTSharpHub
(
Configuration
);
// Enable the Gzip compression especially for Kestrel
services
.
Configure
<
GzipCompressionProviderOptions
>(
options
=>
options
.
Level
=
System
.
IO
.
Compression
.
CompressionLevel
.
Optimal
);
services
.
AddResponseCompression
(
options
=>
...
...
@@ -90,15 +92,12 @@ namespace IoTSharp
configure
.
Description
=
description
?.
Description
;
});
services
.
AddTransient
<
ApplicationDBInitializer
>();
services
.
AddIoTSharpMqttServer
(
AppSettings
.
MqttBroker
);
services
.
AddMqttClient
(
AppSettings
.
MqttClient
);
services
.
AddHostedService
<
CoAPService
>();
//services.AddTransient<IoTSharp.Sys.SystemCancellationToken>();
//foreach (var singletonService in Reflection.GetClassesImplementingInterface<IService>())
//{
// services.AddSingleton(singletonService);
//}
services
.
AddSingleton
<
DiagnosticsService
>();
services
.
AddSingleton
<
RetainedMessageHandler
>();
services
.
AddSingleton
<
SystemStatusService
>();
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
...
...
@@ -119,7 +118,7 @@ namespace IoTSharp
app
.
UseSwagger
();
app
.
UseHttpsRedirection
();
//
app.UseIotSharpMqttServer();
app
.
UseIotSharpMqttServer
();
// serviceProvider.GetRequiredService<MqttService>().Start();
app
.
UseForwardedHeaders
(
new
ForwardedHeadersOptions
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录