Terminate sub processes when running vercel dev

swift-cloud · Feb 15, 2023 · b0432fa · b0432fa
1 parent fc0fb59
commit b0432fa
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -59,8 +59,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio.git",
       "state" : {
-        "revision" : "4ad2c3733845abd9ee8892a323b0fa0d80f37e34",
-        "version" : "2.47.0"
+        "revision" : "45167b8006448c79dda4b7bd604e07a034c15c49",
+        "version" : "2.48.0"
       }
     }
   ],

diff --git a/Plugins/VercelPackager/Plugin.swift b/Plugins/VercelPackager/Plugin.swift
@@ -11,6 +11,7 @@ import PackagePlugin
 @main
 struct VercelPackager: CommandPlugin {
     func performCommand(context: PackagePlugin.PluginContext, arguments: [String]) async throws {
+        Shell.prepare()
         let vercelOutput = VercelOutput(packageManager: packageManager, context: context, arguments: arguments)
         if vercelOutput.isDev {
             try await dev(vercelOutput)

diff --git a/Plugins/VercelPackager/Server/server.js b/Plugins/VercelPackager/Server/server.js
@@ -48,9 +48,3 @@ server.listen(port, () => {
     console.log('Http Server running:', `http://localhost:${port}`)
     console.log('')
 })
-
-server.on('error', () => {
-    console.log('')
-    console.log('Http Server running:', `http://localhost:${port}`)
-    console.log('')
-})
diff --git a/Plugins/VercelPackager/Shell.swift b/Plugins/VercelPackager/Shell.swift
@@ -13,8 +13,24 @@ import PackagePlugin
 import Glibc
 #endif
 
+private let globalSource = DispatchSource.makeSignalSource(signal: SIGINT)
+
+private var spawnQueue = DispatchQueue(label: "vercel.spawn")
+
+private var spawnedProcesses: Set<Process> = []
+
 public struct Shell {
 
+    static func prepare() {
+        signal(SIGINT, SIG_IGN)
+        globalSource.setEventHandler {
+            print("")
+            spawnedProcesses.filter { $0.isRunning }.forEach { $0.terminate() }
+            exit(SIGINT)
+        }
+        globalSource.resume()
+    }
+
     @discardableResult
     public static func execute(
         process: Process = .init(),
@@ -27,6 +43,10 @@ public struct Shell {
         print("\(executable.string) \(arguments.joined(separator: " "))")
         print("")
 
+        _ = spawnQueue.sync {
+            spawnedProcesses.insert(process)
+        }
+
         var output = ""
         let outputSync = DispatchGroup()
         let outputQueue = DispatchQueue(label: "VercelPackager.output")