Fix a Scheduler bug

Modbus.Net/Modbus.Net/Job/MachineJobScheduler.cs

@@ -63,7 +63,7 @@ namespace Modbus.Net
             return new MachineGetJobScheduler(scheduler, trigger);
         }
 
-        public static async void CancelJob(string triggerKey)
+        public static async Task CancelJob(string triggerKey)
         {
             IScheduler scheduler = await StdSchedulerFactory.GetDefaultScheduler();
             var jobKeys = await scheduler.GetJobKeys(GroupMatcher<JobKey>.GroupEquals("Modbus.Net.DataQuery.Group." + triggerKey));

Samples/MachineJob/MachineJob.csproj

@@ -1,27 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Worker">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>dotnet-MachineJob-3eab04d6-e138-4509-8015-d9999d9b2a21</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="appsettings.json" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" />
-  </ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-
-  <ItemGroup>
-    <Content Include="appsettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.2">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
   </ItemGroup>
 
@@ -29,5 +17,4 @@
     <ProjectReference Include="..\..\Modbus.Net\Modbus.Net.Modbus\Modbus.Net.Modbus.csproj" />
     <ProjectReference Include="..\..\Modbus.Net\Modbus.Net\Modbus.Net.csproj" />
   </ItemGroup>
-
 </Project>

Samples/MachineJob/Program.cs

@@ -1,109 +1,10 @@
-// See https://aka.ms/new-console-template for more information
+using MachineJob.Service;
-using MachineJob;
-using Modbus.Net;
-using Modbus.Net.Modbus;
 
-List<AddressUnit> _addresses = new List<AddressUnit>
+IHost host = Host.CreateDefaultBuilder(args)
-{
+    .ConfigureServices(services =>
-    new AddressUnit() { Area = "4X", Address = 1, DataType = typeof(short), Id = "1", Name = "Test1" },
+    {
-    new AddressUnit() { Area = "4X", Address = 2, DataType = typeof(short), Id = "2", Name = "Test2" },
+        services.AddHostedService<Worker>();
-    new AddressUnit() { Area = "4X", Address = 3, DataType = typeof(short), Id = "3", Name = "Test3" },
+    })
-    new AddressUnit() { Area = "4X", Address = 4, DataType = typeof(short), Id = "4", Name = "Test4" },
+    .Build();
-    new AddressUnit() { Area = "4X", Address = 5, DataType = typeof(short), Id = "5", Name = "Test5" },
-    new AddressUnit() { Area = "4X", Address = 6, DataType = typeof(short), Id = "6", Name = "Test6" },
-    new AddressUnit() { Area = "4X", Address = 7, DataType = typeof(short), Id = "7", Name = "Test7" },
-    new AddressUnit() { Area = "4X", Address = 8, DataType = typeof(short), Id = "8", Name = "Test8" },
-    new AddressUnit() { Area = "4X", Address = 9, DataType = typeof(short), Id = "9", Name = "Test9" },
-    new AddressUnit() { Area = "4X", Address = 10, DataType = typeof(short), Id = "10", Name = "Test10" }
-};
-
-IMachine<string> machine = new ModbusMachine<string, string>("ModbusMachine1", ModbusType.Tcp, "192.168.0.172", _addresses, true, 1, 2, Endian.BigEndianLsb);
-IMachine<string> machine2 = new ModbusMachine<string, string>("ModbusMachine2", ModbusType.Tcp, "192.168.0.172:503", _addresses, true, 3, 2, Endian.BigEndianLsb);
-
-await MachineJobSchedulerCreator.CreateScheduler("Trigger1", -1, 5).Result.From(machine.Id, machine, MachineDataType.Name).Result.Query(machine.Id + ".ConsoleQuery", QueryConsole).Result.To(machine.Id + ".To", machine).Result.To(machine2.Id + ".To", machine2).Result.Run();
-//await MachineJobSchedulerCreator.CreateScheduler("Trigger2", -1, 5).Result.Apply(machine2.Id + ".Apply", null, MachineDataType.Name).Result.Query(machine.Id + ".ConsoleQuery2", QueryConsole2).Result.To(machine2.Id + ".To2", machine2).Result.From(machine2.Id, machine2, MachineDataType.Name).Result.Query(machine.Id + ".ConsoleQuery", QueryConsole).Result.Run();
-
-Console.ReadLine();
-
-Dictionary<string, double> QueryConsole(DataReturnDef dataReturnDef)
-{
-    var values = dataReturnDef.ReturnValues;
-    foreach (var value in values)
-    {
-        Console.WriteLine(dataReturnDef.MachineId + " " + value.Key + " " + value.Value.DeviceValue);
-    }
-    
-    try
-    {
-        using (var context = new DatabaseWriteContext())
-        {
-            context.DatabaseWrites.Add(new DatabaseWriteEntity
-            {
-                Value1 = values["Test1"].DeviceValue,
-                Value2 = values["Test2"].DeviceValue,
-                Value3 = values["Test3"].DeviceValue,
-                Value4 = values["Test4"].DeviceValue,
-                Value5 = values["Test5"].DeviceValue,
-                Value6 = values["Test6"].DeviceValue,
-                Value7 = values["Test7"].DeviceValue,
-                Value8 = values["Test8"].DeviceValue,
-                Value9 = values["Test9"].DeviceValue,
-                Value10 = values["Test10"].DeviceValue,
-                UpdateTime = DateTime.Now,
-            });
-            context.SaveChanges();
-        }
-    }
-    catch
-    {
-        //ignore
-    }
-    
-    Random r = new Random();
-    foreach (var value in values)
-    {
-        value.Value.DeviceValue = r.Next(65536) - 32768;
-    }
-
-    return values.MapGetValuesToSetValues();
-}
-
-Dictionary<string, double> QueryConsole2(DataReturnDef dataReturnDef)
-{
-    Random r = new Random();
-    var datas = new Dictionary<string, double>()
-    {
-        {
-            "Test1", r.Next(65536) - 32768
-        },
-        {
-            "Test2", r.Next(65536) - 32768 
-        },
-        {
-            "Test3", r.Next(65536) - 32768
-        },
-        {
-            "Test4", r.Next(65536) - 32768
-        },
-        {
-            "Test5", r.Next(65536) - 32768
-        },
-        {
-            "Test6", r.Next(65536) - 32768
-        },
-        {
-            "Test7", r.Next(65536) - 32768
-        },
-        {
-            "Test8", r.Next(65536) - 32768
-        },
-        {
-            "Test9", r.Next(65536) - 32768
-        },
-        {
-            "Test10", r.Next(65536) - 32768
-        }
-    };
-    return datas;
-}
 
+await host.RunAsync();

Samples/MachineJob/Properties/launchSettings.json

@@ -0,0 +1,11 @@
+{
+  "profiles": {
+    "MachineJob": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "environmentVariables": {
+        "DOTNET_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

Samples/MachineJob/Worker.cs

@@ -0,0 +1,123 @@
+using Modbus.Net;
+using Modbus.Net.Modbus;
+
+namespace MachineJob.Service
+{
+    public class Worker : BackgroundService
+    {
+        private readonly ILogger<Worker> _logger;
+
+        public Worker(ILogger<Worker> logger)
+        {
+            _logger = logger;
+        }
+
+        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+        {
+            List<AddressUnit> _addresses = new List<AddressUnit>
+            {
+                new AddressUnit() { Area = "4X", Address = 1, DataType = typeof(short), Id = "1", Name = "Test1" },
+                new AddressUnit() { Area = "4X", Address = 2, DataType = typeof(short), Id = "2", Name = "Test2" },
+                new AddressUnit() { Area = "4X", Address = 3, DataType = typeof(short), Id = "3", Name = "Test3" },
+                new AddressUnit() { Area = "4X", Address = 4, DataType = typeof(short), Id = "4", Name = "Test4" },
+                new AddressUnit() { Area = "4X", Address = 5, DataType = typeof(short), Id = "5", Name = "Test5" },
+                new AddressUnit() { Area = "4X", Address = 6, DataType = typeof(short), Id = "6", Name = "Test6" },
+                new AddressUnit() { Area = "4X", Address = 7, DataType = typeof(short), Id = "7", Name = "Test7" },
+                new AddressUnit() { Area = "4X", Address = 8, DataType = typeof(short), Id = "8", Name = "Test8" },
+                new AddressUnit() { Area = "4X", Address = 9, DataType = typeof(short), Id = "9", Name = "Test9" },
+                new AddressUnit() { Area = "4X", Address = 10, DataType = typeof(short), Id = "10", Name = "Test10" }
+            };
+
+            IMachine<string> machine = new ModbusMachine<string, string>("ModbusMachine1", ModbusType.Tcp, "192.168.0.161", _addresses, true, 1, 2, Endian.BigEndianLsb);
+            //IMachine<string> machine2 = new ModbusMachine<string, string>("ModbusMachine2", ModbusType.Tcp, "192.168.0.172", _addresses, true, 3, 2, Endian.BigEndianLsb);
+
+            await MachineJobSchedulerCreator.CreateScheduler("Trigger1", -1, 5).Result.From(machine.Id, machine, MachineDataType.Name).Result.Query(machine.Id + ".ConsoleQuery", QueryConsole).Result.To(machine.Id + ".To", machine).Result.Run();
+            //await MachineJobSchedulerCreator.CreateScheduler("Trigger2", -1, 5).Result.Apply(machine2.Id + ".Apply", null, MachineDataType.Name).Result.Query(machine2.Id + ".ConsoleQuery", QueryConsole2).Result.To(machine2.Id + ".To2", machine2).Result.From(machine2.Id, machine2, MachineDataType.Name).Result.Query(machine2.Id + ".ConsoleQuery2", QueryConsole).Result.Run();
+
+            Console.ReadLine();
+        }
+
+        private Dictionary<string, double> QueryConsole(DataReturnDef dataReturnDef)
+        {
+            var values = dataReturnDef.ReturnValues;
+            foreach (var value in values)
+            {
+                Console.WriteLine(dataReturnDef.MachineId + " " + value.Key + " " + value.Value.DeviceValue);
+            }
+    
+            try
+            {
+                using (var context = new DatabaseWriteContext())
+                {
+                    context.DatabaseWrites.Add(new DatabaseWriteEntity
+                    {
+                        Value1 = values["Test1"].DeviceValue,
+                        Value2 = values["Test2"].DeviceValue,
+                        Value3 = values["Test3"].DeviceValue,
+                        Value4 = values["Test4"].DeviceValue,
+                        Value5 = values["Test5"].DeviceValue,
+                        Value6 = values["Test6"].DeviceValue,
+                        Value7 = values["Test7"].DeviceValue,
+                        Value8 = values["Test8"].DeviceValue,
+                        Value9 = values["Test9"].DeviceValue,
+                        Value10 = values["Test10"].DeviceValue,
+                        UpdateTime = DateTime.Now,
+                    });
+                    context.SaveChanges();
+                }
+            }
+            catch
+            {
+                //ignore
+            }
+    
+            Random r = new Random();
+            foreach (var value in values)
+            {
+                value.Value.DeviceValue = r.Next(65536) - 32768;
+            }
+
+            return values.MapGetValuesToSetValues();
+        }
+
+        private Dictionary<string, double> QueryConsole2(DataReturnDef dataReturnDef)
+        {
+            Random r = new Random();
+            var datas = new Dictionary<string, double>()
+            {
+                {
+                    "Test1", r.Next(65536) - 32768
+                },
+                {
+                    "Test2", r.Next(65536) - 32768 
+                },
+                {
+                    "Test3", r.Next(65536) - 32768
+                },
+                {
+                    "Test4", r.Next(65536) - 32768
+                },
+                {
+                    "Test5", r.Next(65536) - 32768
+                },
+                {
+                    "Test6", r.Next(65536) - 32768
+                },
+                {
+                    "Test7", r.Next(65536) - 32768
+                },
+                {
+                    "Test8", r.Next(65536) - 32768
+                },
+                {
+                    "Test9", r.Next(65536) - 32768
+                },
+                {
+                    "Test10", r.Next(65536) - 32768
+                }
+            };
+            return datas;
+        }
+
+    }
+}

Samples/MachineJob/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}

Samples/MachineJob/appsettings.json

@@ -1,4 +1,10 @@
-{
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
   "ConnectionStrings": {
     "DatabaseWriteConnectionString": "Server=localhost; User ID=root; Password=123456; Database=modbusnettest;"
   },