Change service name and description (#61)

* Change service name and description * Remove old service after upgrade
koho · May 30, 2023 · 8302e3a · 8302e3a
1 parent d369849
commit 8302e3a
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 40 deletions.
diff --git a/installer/actions/actions/CustomAction.cs b/installer/actions/actions/CustomAction.cs
@@ -1,10 +1,8 @@
 using Microsoft.Deployment.WindowsInstaller;
 using System;
-using System.Collections.Generic;
 using System.Configuration.Install;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Management;
 using System.Runtime.InteropServices;
 using System.ServiceProcess;
@@ -90,6 +88,45 @@ public static int ForceDeleteDirectory(string path)
             }
         }
 
+        public static void RemoveServices(Session session, string prefix, string binPath)
+        {
+            ServiceController[] services = ServiceController.GetServices();
+            foreach (ServiceController controller in services)
+            {
+                ManagementObject wmiService = new ManagementObject("Win32_Service.Name='" + controller.ServiceName + "'");
+                wmiService.Get();
+                string pathName = wmiService.GetPropertyValue("PathName").ToString();
+                string path1 = pathName.Substring(0, Math.Min(binPath.Length, pathName.Length));
+                string path2 = pathName.Substring(1, Math.Min(binPath.Length, pathName.Length - 1));
+                if ((binPath.ToLower().Equals(path1.ToLower()) || binPath.ToLower().Equals(path2.ToLower())) && controller.ServiceName.StartsWith(prefix))
+                {
+                    try
+                    {
+                        controller.Stop();
+                        controller.WaitForStatus(ServiceControllerStatus.Stopped);
+                    }
+                    catch (Exception)
+                    {
+                        session.Log("Failed to stop " + controller.ServiceName);
+                    }
+
+                    ServiceInstaller installer = new ServiceInstaller
+                    {
+                        Context = new InstallContext(),
+                        ServiceName = controller.ServiceName
+                    };
+                    try
+                    {
+                        installer.Uninstall(null);
+                    }
+                    catch (Exception)
+                    {
+                        session.Log("Failed to uninstall " + controller.ServiceName);
+                    }
+                }
+            }
+        }
+
         [CustomAction]
         public static ActionResult KillProcesses(Session session)
         {
@@ -142,41 +179,7 @@ public static ActionResult EvaluateFrpServices(Session session)
             {
                 return ActionResult.Success;
             }
-            ServiceController[] services = ServiceController.GetServices();
-            foreach (ServiceController controller in services)
-            {
-                ManagementObject wmiService = new ManagementObject("Win32_Service.Name='" + controller.ServiceName + "'");
-                wmiService.Get();
-                string pathName = wmiService.GetPropertyValue("PathName").ToString();
-                string path1 = pathName.Substring(0, Math.Min(binPath.Length, pathName.Length));
-                string path2 = pathName.Substring(1, Math.Min(binPath.Length, pathName.Length - 1));
-                if (binPath.ToLower().Equals(path1.ToLower()) || binPath.ToLower().Equals(path2.ToLower()))
-                {
-                    try
-                    {
-                        controller.Stop();
-                        controller.WaitForStatus(ServiceControllerStatus.Stopped);
-                    }
-                    catch (Exception)
-                    {
-                        session.Log("Failed to stop " + controller.ServiceName);
-                    }
-
-                    ServiceInstaller installer = new ServiceInstaller
-                    {
-                        Context = new InstallContext(),
-                        ServiceName = controller.ServiceName
-                    };
-                    try
-                    {
-                        installer.Uninstall(null);
-                    }
-                    catch (Exception)
-                    {
-                        session.Log("Failed to uninstall " + controller.ServiceName);
-                    }
-                }
-            }
+            RemoveServices(session, "", binPath);
             return ActionResult.Success;
         }
 
@@ -245,5 +248,18 @@ public static ActionResult MoveFrpProfiles(Session session)
             }
             return ActionResult.Success;
         }
+
+        [CustomAction]
+        public static ActionResult RemoveOldFrpServices(Session session)
+        {
+            session.Log("Remove old FRP Services");
+            string binPath = session["CustomActionData"];
+            if (string.IsNullOrEmpty(binPath))
+            {
+                return ActionResult.Success;
+            }
+            RemoveServices(session, "FRPC$", binPath);
+            return ActionResult.Success;
+        }
     }
 }
diff --git a/installer/msi/frpmgr.wxs b/installer/msi/frpmgr.wxs
@@ -101,6 +101,7 @@
 		<CustomAction Id="RemoveFrpFiles.SetProperty" Return="check" Property="RemoveFrpFiles" Value="[INSTALLFOLDER]" />
 		<CustomAction Id="SetLangConfig.SetProperty" Return="check" Property="SetLangConfig" Value="[#LangConfig]" />
 		<CustomAction Id="MoveFrpProfiles.SetProperty" Return="check" Property="MoveFrpProfiles" Value="[INSTALLFOLDER]" />
+		<CustomAction Id="RemoveOldFrpServices.SetProperty" Return="check" Property="RemoveOldFrpServices" Value="[#MainApplication]" />
 
 		<!--
 			Launch application
@@ -160,5 +161,14 @@
 			<Custom Action="MoveFrpProfiles.SetProperty" After="InstallFiles" />
 			<Custom Action="MoveFrpProfiles" After="MoveFrpProfiles.SetProperty">NOT (REMOVE="ALL")</Custom>
 		</InstallExecuteSequence>
+
+		<!--
+			Delete old version frp services
+		-->
+		<CustomAction Id="RemoveOldFrpServices" BinaryKey="actions.dll" DllEntry="RemoveOldFrpServices" Impersonate="no" Execute="deferred" />
+		<InstallExecuteSequence>
+			<Custom Action="RemoveOldFrpServices.SetProperty" After="InstallFiles" />
+			<Custom Action="RemoveOldFrpServices" After="RemoveOldFrpServices.SetProperty">NOT (REMOVE="ALL")</Custom>
+		</InstallExecuteSequence>
 	</Fragment>
 </Wix>
diff --git a/services/install.go b/services/install.go
@@ -67,7 +67,7 @@ func InstallService(name string, configPath string, manual bool) error {
 		StartType:    mgr.StartAutomatic,
 		ErrorControl: mgr.ErrorNormal,
 		DisplayName:  DisplayNameOfClient(name),
-		Description:  "FRP Client Daemon Service",
+		Description:  "FRP Runtime Service for FRP Manager.",
 		SidType:      windows.SERVICE_SID_TYPE_UNRESTRICTED,
 	}
 	if manual {

diff --git a/services/service.go b/services/service.go
@@ -1,6 +1,7 @@
 package services
 
 import (
+	"crypto/md5"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -14,11 +15,11 @@ import (
 )
 
 func ServiceNameOfClient(name string) string {
-	return fmt.Sprintf("FRPC$%s", name)
+	return fmt.Sprintf("frpmgr_%x", md5.Sum([]byte(name)))
 }
 
 func DisplayNameOfClient(name string) string {
-	return "FRP Client: " + name
+	return "FRP Manager: " + name
 }
 
 type frpService struct {