فهرست منبع

PipeIPCClient -> IPCClient

Kenric Nugteren 2 سال پیش
والد
کامیت
db0b3a94d7

+ 2 - 1
prs.desktop/MainWindow.xaml.cs

@@ -73,6 +73,7 @@ using InABox.Wpf;
 using javax.xml.crypto;
 using PRSDesktop.Components.Spreadsheet;
 using InABox.Wpf.Reports;
+using InABox.IPC;
 
 namespace PRSDesktop
 {
@@ -180,7 +181,7 @@ namespace PRSDesktop
                     break;
                 
                 case DatabaseType.Local:
-                    ClientFactory.SetClientType(typeof(PipeIPCClient<>), Platform.Desktop, CoreUtils.GetVersion(), 
+                    ClientFactory.SetClientType(typeof(IPCClient<>), Platform.Desktop, CoreUtils.GetVersion(), 
                         DatabaseServerProperties.GetPipeName(App.DatabaseSettings.LocalServerName));
                     break;
             }

+ 2 - 1
prs.desktop/Utils/SelectDatabase.xaml.cs

@@ -13,6 +13,7 @@ using InABox.Client.IPC;
 using InABox.Clients;
 using InABox.Configuration;
 using InABox.Core;
+using InABox.IPC;
 using InABox.Wpf;
 using InABox.WPF;
 using PRSServer;
@@ -134,7 +135,7 @@ namespace PRSDesktop
                         DatabaseInfo info = new DatabaseInfo(db.ColorScheme, db.Logo, CoreUtils.GetVersion(), true);
                         
                         if (db.DatabaseType == DatabaseType.Local)
-                            info = new PipeIPCClient<User>(DatabaseServerProperties.GetPipeName(db.LocalServerName)).Info();
+                            info = new IPCClient<User>(DatabaseServerProperties.GetPipeName(db.LocalServerName)).Info();
                         else if (db.DatabaseType == DatabaseType.Networked)
                             RestClient<User>.Ping(db.URLs, out info);
                         UpdateInfo(key, db, info, border, image, dbver);

+ 3 - 3
prs.server/Engines/Database/DatabaseEngine.cs

@@ -12,9 +12,9 @@ using InABox.Core;
 using InABox.Database;
 using InABox.Database.SQLite;
 using InABox.DeviceIdentifier;
+using InABox.IPC;
 using InABox.Server;
 using InABox.Wpf.Reports;
-using Piping;
 using PRS.Shared;
 using Timer = System.Timers.Timer;
 
@@ -25,7 +25,7 @@ namespace PRSServer
         private Timer? CertificateRefreshTimer;
         private Timer? CertificateHaltTimer;
         private string PipeName;
-        private PipeIPCServer? PipeServer;
+        private IPCServer? PipeServer;
 
         public override void Configure(Server server)
         {
@@ -197,7 +197,7 @@ namespace PRSServer
             Logger.Send(LogType.Information, "", string.Format("Rest Server Started listening on port {0}", Properties.Port));
 
             Logger.Send(LogType.Information, "", $"Starting Pipe Listener with pipe name {PipeName}");
-            PipeServer = new PipeIPCServer(PipeName);
+            PipeServer = new IPCServer(PipeName);
             PipeServer.Start();
 
             Logger.Send(LogType.Information, "", "Pipe Listener started");

+ 2 - 1
prs.server/Engines/GPS/GPSEngine.cs

@@ -12,6 +12,7 @@ using InABox.Client.IPC;
 using InABox.Clients;
 using InABox.Core;
 using InABox.DigitalMatter;
+using InABox.IPC;
 using PRSServer.Engines;
 
 namespace PRSServer
@@ -226,7 +227,7 @@ namespace PRSServer
             CoreUtils.RegisterClasses();
             ComalUtils.RegisterClasses();
 
-            ClientFactory.SetClientType(typeof(PipeIPCClient<>), Platform.GPSEngine, Version, DatabaseServerProperties.GetPipeName(Properties.Server));
+            ClientFactory.SetClientType(typeof(IPCClient<>), Platform.GPSEngine, Version, DatabaseServerProperties.GetPipeName(Properties.Server));
             CheckConnection();
 
             DMFactory.Initialise(Properties.DumpFormat, Properties.DumpFile);

+ 2 - 1
prs.server/Engines/Scheduler/ScheduleEngine.cs

@@ -4,6 +4,7 @@ using Comal.TaskScheduler.Shared;
 using InABox.Client.IPC;
 using InABox.Clients;
 using InABox.Core;
+using InABox.IPC;
 
 namespace PRSServer
 {
@@ -33,7 +34,7 @@ namespace PRSServer
                     Logger.Send(LogType.Error, "", "Server is blank!");
                     return;
                 }
-                ClientFactory.SetClientType(typeof(PipeIPCClient<>), Platform.SchedulerEngine, Version, DatabaseServerProperties.GetPipeName(Properties.Server));
+                ClientFactory.SetClientType(typeof(IPCClient<>), Platform.SchedulerEngine, Version, DatabaseServerProperties.GetPipeName(Properties.Server));
                 CheckConnection();
 
                 Logger.Send(LogType.Information, "", "Starting Scheduler: ");

+ 2 - 1
prs.server/Engines/WebEngine/WebEngine.cs

@@ -6,6 +6,7 @@ using InABox.Client.IPC;
 using InABox.Clients;
 using InABox.Configuration;
 using InABox.Core;
+using InABox.IPC;
 using InABox.Wpf.Reports;
 
 namespace PRSServer
@@ -29,7 +30,7 @@ namespace PRSServer
                 Logger.Send(LogType.Error, "", "Server is blank!");
                 return;
             }
-            ClientFactory.SetClientType(typeof(PipeIPCClient<>), Platform.WebEngine, Version, DatabaseServerProperties.GetPipeName(Properties.Server));
+            ClientFactory.SetClientType(typeof(IPCClient<>), Platform.WebEngine, Version, DatabaseServerProperties.GetPipeName(Properties.Server));
 
             Logger.Send(LogType.Information, "", "Registering Classes");
 

+ 3 - 3
prs.server/Forms/ServerGrid.cs

@@ -27,7 +27,7 @@ using InABox.Database;
 using InABox.Database.SQLite;
 using InABox.DeviceIdentifier;
 using InABox.DynamicGrid;
-using InABox.IPC.Shared;
+using InABox.IPC;
 using InABox.Scripting;
 using InABox.Wpf.Editors;
 using InABox.WPF;
@@ -372,7 +372,7 @@ namespace PRSServer
                                 {
                                     var client = IPCClientFactory.GetClient(DatabaseServerProperties.GetPipeName(key));
 
-                                    var response = client.Send(PipeRequest.Info(new InfoRequest()), 10_000).GetResponse<InfoResponse>();
+                                    var response = client.Send(IPCMessage.Info(new InfoRequest()), 10_000).GetResponse<InfoResponse>();
                                     if (response.Status != StatusCode.Error)
                                     {
                                         SecureConnections[key] = response.Info.IsHTTPS;
@@ -1088,7 +1088,7 @@ namespace PRSServer
                         currentServerPort = null;
                         currentServerURL = null;
                         currentServerName = pipeName;
-                        ClientFactory.SetClientType(typeof(PipeIPCClient<>), Platform.Server, CoreUtils.GetVersion(), pipeName);
+                        ClientFactory.SetClientType(typeof(IPCClient<>), Platform.Server, CoreUtils.GetVersion(), pipeName);
                         using (new WaitCursor())
                         {
                             if (!Client.Ping())