Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit16a7263

Browse files
committed
process -> subprocess package
1 parent2bf41aa commit16a7263

File tree

2 files changed

+48
-33
lines changed

2 files changed

+48
-33
lines changed

‎Coder Desktop/VPNLib/FileSync/FileSyncDaemon.swift

Lines changed: 44 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import Foundation
22
import GRPC
33
import NIO
44
import os
5+
import Subprocess
56

67
@MainActor
78
publicprotocolFileSyncDaemon:ObservableObject{
@@ -20,8 +21,7 @@ public class MutagenDaemon: FileSyncDaemon {
2021
}
2122
}
2223

23-
privatevarmutagenProcess:Process?
24-
privatevarmutagenPipe:Pipe?
24+
privatevarmutagenProcess:Subprocess?
2525
privateletmutagenPath:URL!
2626
privateletmutagenDataDirectory:URL
2727
privateletmutagenDaemonSocket:URL
@@ -58,24 +58,42 @@ public class MutagenDaemon: FileSyncDaemon {
5858
try?awaitconnect()
5959
awaitstop()
6060

61-
(mutagenProcess, mutagenPipe)=createMutagenProcess()
61+
mutagenProcess=createMutagenProcess()
62+
// swiftlint:disable:next large_tuple
63+
let(standardOutput, standardError, waitForExit):(Pipe.AsyncBytes,Pipe.AsyncBytes,@Sendable()async->Void)
6264
do{
63-
try mutagenProcess?.run()
65+
(standardOutput, standardError, waitForExit)=try mutagenProcess!.run()
6466
}catch{
6567
state=.failed(DaemonError.daemonStartFailure(error))
68+
return
69+
}
70+
71+
Task{
72+
awaitstreamHandler(io: standardOutput)
73+
logger.info("standard output stream closed")
74+
}
75+
76+
Task{
77+
awaitstreamHandler(io: standardError)
78+
logger.info("standard error stream closed")
79+
}
80+
81+
Task{
82+
awaitterminationHandler(waitForExit: waitForExit)
6683
}
6784

6885
do{
6986
tryawaitconnect()
7087
}catch{
7188
state=.failed(DaemonError.daemonStartFailure(error))
89+
return
7290
}
7391

7492
state=.running
7593
logger.info(
7694
"""
7795
mutagen daemon started, pid:
78-
\(self.mutagenProcess?.processIdentifier.description??"unknown", privacy:.public)
96+
\(self.mutagenProcess?.pid.description??"unknown", privacy:.public)
7997
"""
8098
)
8199
}
@@ -129,46 +147,39 @@ public class MutagenDaemon: FileSyncDaemon {
129147

130148
try?awaitcleanupGRPC()
131149

132-
mutagenProcess?.terminate()
150+
mutagenProcess?.kill()
151+
mutagenProcess=nil
133152
logger.info("Daemon stopped and gRPC connection closed")
134153
}
135154

136-
privatefunc createMutagenProcess()->(Process,Pipe){
137-
letoutputPipe=Pipe()
138-
outputPipe.fileHandleForReading.readabilityHandler= logOutput
139-
letprocess=Process()
140-
process.executableURL= mutagenPath
141-
process.arguments=["daemon","run"]
142-
logger.info("setting mutagen data directory:\(self.mutagenDataDirectory.path, privacy:.public)")
155+
privatefunc createMutagenProcess()->Subprocess{
156+
letprocess=Subprocess([mutagenPath.path,"daemon","run"])
143157
process.environment=[
144158
"MUTAGEN_DATA_DIRECTORY": mutagenDataDirectory.path,
145159
]
146-
process.standardOutput= outputPipe
147-
process.standardError= outputPipe
148-
process.terminationHandler= terminationHandler
149-
return(process, outputPipe)
160+
logger.info("setting mutagen data directory:\(self.mutagenDataDirectory.path, privacy:.public)")
161+
return process
150162
}
151163

152-
privatenonisolatedfunc terminationHandler(process _:Process){
153-
Task{@MainActorin
154-
self.mutagenPipe?.fileHandleForReading.readabilityHandler=nil
155-
mutagenProcess=nil
164+
privatefunc terminationHandler(waitForExit:@Sendable()async->Void)async{
165+
awaitwaitForExit()
156166

157-
try?awaitcleanupGRPC()
158-
159-
switchself.state{
160-
case.stopped:
161-
logger.info("mutagen daemon stopped")
162-
return
163-
default:
164-
logger.error("mutagen daemon exited unexpectedly")
165-
self.state=.failed(.terminatedUnexpectedly)
166-
}
167+
switch state{
168+
case.stopped:
169+
logger.info("mutagen daemon stopped")
170+
default:
171+
logger.error(
172+
"""
173+
mutagen daemon exited unexpectedly with code:
174+
\(self.mutagenProcess?.exitCode.description??"unknown")
175+
"""
176+
)
177+
state=.failed(.terminatedUnexpectedly)
167178
}
168179
}
169180

170-
privatenonisolatedfunclogOutput(pipe:FileHandle){
171-
iflet line=String(data: pipe.availableData, encoding:.utf8), line!=""{
181+
privatefuncstreamHandler(io:Pipe.AsyncBytes)async{
182+
forawaitlinein io.lines{
172183
logger.info("\(line, privacy:.public)")
173184
}
174185
}

‎Coder Desktop/project.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ packages:
112112
url:https://github.com/grpc/grpc-swift
113113
# v2 does not support macOS 14.0
114114
exactVersion:1.24.2
115+
Subprocess:
116+
url:https://github.com/jamf/Subprocess
117+
revision:9d67b79
115118

116119
targets:
117120
Coder Desktop:
@@ -270,6 +273,7 @@ targets:
270273
-package:SwiftProtobuf
271274
product:SwiftProtobufPluginLibrary
272275
-package:GRPC
276+
-package:Subprocess
273277
-target:CoderSDK
274278
embed:false
275279

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp