Skip to content

Commit

Permalink
v1.4.0-beta.44
Browse files Browse the repository at this point in the history
- Fixes JS error when selecting "GPIO" package in the setup wizard
- Fixes MIME type for *.m3u8*/*.ts* (HLS streams can now be served from HG web root)
- Updated deps to latest version
  • Loading branch information
genemars committed Sep 5, 2023
1 parent e63f9db commit 7707fa3
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 32 deletions.
2 changes: 1 addition & 1 deletion assets/build/all/app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@

</div>

<script src="runtime.b92e2ca178ebbf4a.js" type="module"></script><script src="polyfills.a360d6e45b80c065.js" type="module"></script><script src="scripts.0dcb4f0a61221c18.js" defer></script><script src="main.abf40be88cdd31f0.js" type="module"></script>
<script src="runtime.b92e2ca178ebbf4a.js" type="module"></script><script src="polyfills.a360d6e45b80c065.js" type="module"></script><script src="scripts.0dcb4f0a61221c18.js" defer></script><script src="main.bd68f79f3efc8d63.js" type="module"></script>

</body></html>

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions assets/build/all/app/ngsw.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"configVersion": 1,
"timestamp": 1693325751714,
"timestamp": 1693905412921,
"index": "/app/index.html",
"assetGroups": [
{
Expand All @@ -15,7 +15,7 @@
"/app/613.16b9c52c0ae74833.js",
"/app/859.0f150be9c99a6b5a.js",
"/app/index.html",
"/app/main.abf40be88cdd31f0.js",
"/app/main.bd68f79f3efc8d63.js",
"/app/manifest.webmanifest",
"/app/polyfills.a360d6e45b80c065.js",
"/app/runtime.b92e2ca178ebbf4a.js",
Expand Down Expand Up @@ -729,8 +729,8 @@
"/app/assets/widgets/weather/images_alt/thunder.svg": "2ace7038dfd663330cecc350d680ef08206d62ff",
"/app/assets/widgets/weather/images_alt/weather.svg": "c719c09048977fd40688272316b35ddf1bdf89e8",
"/app/assets/workers/typings-worker.js": "8df10d867c12d36cdebfb7e16caacd0020db301f",
"/app/index.html": "f1f7078f0dc9c9900e4ffdbf58bdda249ea05879",
"/app/main.abf40be88cdd31f0.js": "71b8c4b592ee88116695ca4a25134668fc831dc2",
"/app/index.html": "d1f51f4c4687d9ed788041edb81e542671a24e21",
"/app/main.bd68f79f3efc8d63.js": "024ef88a93fe57853d0044a481e3b0aa476656a9",
"/app/manifest.webmanifest": "d47bb07a495e27ddf072f8702df373f79b4eb183",
"/app/polyfills.a360d6e45b80c065.js": "f317e1a3e4bb6a84068c7e1845a2ce8b2f956ee7",
"/app/runtime.b92e2ca178ebbf4a.js": "b50d841a4c50d466c34aab3267d3fb4afe87dede",
Expand Down
6 changes: 3 additions & 3 deletions src/HomeGenie.Tests/HomeGenie.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
7 changes: 3 additions & 4 deletions src/HomeGenie/Automation/Engines/CSharpAppFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ public static class CSharpAppFactory
"System.Dynamic",
"System.Net",
"System.Threading",
"System.Threading.Tasks",
"System.Security.Cryptography",
"System.Security.Cryptography.X509Certificates",
#if NETCOREAPP
Expand All @@ -75,6 +76,7 @@ public static class CSharpAppFactory
"HomeGenie.Automation",
"HomeGenie.Data",
"NetClientLib",
"OnvifDiscovery",
"OnvifDiscovery.Models",
"MIG",
"MIG.Interfaces.HomeAutomation.Commons",
Expand Down Expand Up @@ -238,6 +240,7 @@ private HomeGenie.Automation.MethodRunResult Setup()
MetadataReference.CreateFromFile(Path.Combine(homeGenieDir, "HomeGenie.dll")),

MetadataReference.CreateFromFile(Path.Combine(dotNetCoreDir, "System.dll")),
MetadataReference.CreateFromFile(Path.Combine(dotNetCoreDir, "System.ObjectModel.dll")),
MetadataReference.CreateFromFile(Path.Combine(dotNetCoreDir, "System.Core.dll")),
MetadataReference.CreateFromFile(typeof(CSharpArgumentInfo).GetTypeInfo().Assembly.Location),

Expand Down Expand Up @@ -328,11 +331,7 @@ private HomeGenie.Automation.MethodRunResult Setup()
switch (assemblyName.Name.ToLower())
{
case "system":
compilerParams.ReferencedAssemblies.Add(assembly.Location);
break;
case "system.core":
compilerParams.ReferencedAssemblies.Add(assembly.Location);
break;
case "microsoft.csharp":
compilerParams.ReferencedAssemblies.Add(assembly.Location);
break;
Expand Down
10 changes: 7 additions & 3 deletions src/HomeGenie/Automation/Scripting/MqttClientHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ public MqttClientHelper Publish(string topic, string message)
mqttClient.PublishAsync(new MqttApplicationMessage()
{
Topic =topic,
Payload = Encoding.UTF8.GetBytes(message),
PayloadSegment = new ArraySegment<byte>(Encoding.UTF8.GetBytes(message)),
QualityOfServiceLevel = MqttQualityOfServiceLevel.AtLeastOnce,
Retain = false
});
Expand All @@ -271,7 +271,7 @@ public MqttClientHelper Publish(string topic, byte[] message)
mqttClient.PublishAsync(new MqttApplicationMessage()
{
Topic =topic,
Payload = message,
PayloadSegment = new ArraySegment<byte>(message),
QualityOfServiceLevel = MqttQualityOfServiceLevel.AtLeastOnce,
Retain = false
});
Expand Down Expand Up @@ -350,6 +350,8 @@ private MqttClientOptionsBuilder GetMqttOptionsBuilder(string clientId)
if (usingWebSockets)
{
builder.WithWebSocketServer(endPoint.Address + ":" + endPoint.Port + "/mqtt");
// TODO: WARNING -- upgrading to MQTTnet 4.3.0.858 WebSocket connection won't work anymore
//builder.WithWebSocketServer(o => o.WithUri(endPoint.Address + ":" + endPoint.Port + "/mqtt"));
}
else
{
Expand All @@ -363,13 +365,15 @@ private MqttClientOptionsBuilder GetMqttOptionsBuilder(string clientId)
{
var tlsParameters = new MqttClientOptionsBuilderTlsParameters {UseTls = true};
builder.WithTls(tlsParameters);
// TODO: WARNING -- upgrading to MQTTnet 4.3.0.858 WebSocket connection won't work anymore
//builder.WithTlsOptions(o => o.UseTls());
}
return builder;
}

private void MessageReceived(MqttApplicationMessageReceivedEventArgs args)
{
var msg = args.ApplicationMessage.Payload;
var msg = args.ApplicationMessage.PayloadSegment.Array;
var topic = args.ApplicationMessage.Topic;
foreach(KeyValuePair<string, Action<string, byte[]>> subscription in subscribeTopics)
{
Expand Down
38 changes: 22 additions & 16 deletions src/HomeGenie/HomeGenie.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,40 +12,46 @@
<EnableMLUnsupportedPlatformTargetCheck>false</EnableMLUnsupportedPlatformTargetCheck>
</PropertyGroup>

<!-- .NET FramwWork -->
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
<PackageReference Include="CronExpressionDescriptor" Version="1.21.2" />
<PackageReference Include="NLog" Version="5.1.3" />
</ItemGroup>

<!-- .NET (dotnet) -->
<ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">
<PackageReference Include="System.ObjectModel" Version="4.3.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommonMark.NET" Version="0.15.1" />
<PackageReference Include="HG.NWaves" Version="0.9.6" />
<PackageReference Include="HG.Raspberry.IO.SerialPeripheralInterface" Version="2.4.11" />
<PackageReference Include="Iot.Device.Bindings" Version="2.2.0" />
<PackageReference Include="IronPython" Version="3.4.0" />
<PackageReference Include="IronPython.StdLib" Version="3.4.0" />
<PackageReference Include="Iot.Device.Bindings" Version="3.0.0" />
<PackageReference Include="IronPython" Version="3.4.1" />
<PackageReference Include="IronPython.StdLib" Version="3.4.1" />
<PackageReference Include="KNX.net" Version="1.1.10" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="6.0.7" />
<PackageReference Include="MIG" Version="1.2.11" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.2" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="6.0.11" />
<PackageReference Include="MIG" Version="1.2.15" />
<PackageReference Include="MIG.HomeAutomation" Version="1.2.19" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SerialPortStream" Version="2.4.1" />
<PackageReference Include="SharpZipLib" Version="1.4.2" />
<PackageReference Include="Angle" Version="3.2.1" />
<PackageReference Include="SolarCalculator" Version="3.2.1" />
<PackageReference Include="Jint" Version="3.0.0-beta-2048" />
<PackageReference Include="System.Device.Gpio" Version="2.2.0" />
<PackageReference Include="Angle" Version="3.3.0" />
<PackageReference Include="SolarCalculator" Version="3.3.0" />
<PackageReference Include="Jint" Version="3.0.0-beta-2051" />
<PackageReference Include="System.Device.Gpio" Version="3.0.0" />
<PackageReference Include="System.IO.Ports" Version="6.0.0" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
<PackageReference Include="CronExpressionDescriptor" Version="2.19.0" />
<PackageReference Include="LiteDB" Version="5.0.16" />
<PackageReference Include="NCrontab" Version="3.3.1" />
<PackageReference Include="CronExpressionDescriptor" Version="2.21.0" />
<PackageReference Include="LiteDB" Version="5.0.17" />
<PackageReference Include="NCrontab" Version="3.3.3" />
<PackageReference Include="SuperSocket.ClientEngine.Core" Version="0.10.0" />
<PackageReference Include="UnitsNet" Version="4.149.0" />
<PackageReference Include="UnitsNet" Version="5.32.0" />

<PackageReference Include="MQTTnet" Version="4.1.4.563" />
<PackageReference Include="MQTTnet" Version="4.2.1.781" />
<PackageReference Include="SerialPortLib" Version="1.1.1" />
<PackageReference Include="MIG.Protocols" Version="1.2.8" />

Expand All @@ -55,7 +61,7 @@
<PackageReference Include="HG.Raspberry.System" Version="2.1.2" />

<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="ZWaveLib" Version="1.1.1" />

Expand Down

0 comments on commit 7707fa3

Please sign in to comment.