@livestore/utils-dev 0.4.0-dev.6 → 0.4.0-dev.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/.tsbuildinfo.json +1 -1
- package/dist/node/DockerComposeService/DockerComposeService.d.ts +14 -4
- package/dist/node/DockerComposeService/DockerComposeService.d.ts.map +1 -1
- package/dist/node/DockerComposeService/DockerComposeService.js +27 -10
- package/dist/node/DockerComposeService/DockerComposeService.js.map +1 -1
- package/dist/node/mod.d.ts +0 -2
- package/dist/node/mod.d.ts.map +1 -1
- package/dist/node/mod.js +0 -2
- package/dist/node/mod.js.map +1 -1
- package/dist/node-vitest/Vitest.d.ts +6 -6
- package/dist/node-vitest/Vitest.d.ts.map +1 -1
- package/dist/node-vitest/Vitest.js +2 -2
- package/dist/node-vitest/Vitest.js.map +1 -1
- package/dist/node-vitest/Vitest.test.js +12 -1
- package/dist/node-vitest/Vitest.test.js.map +1 -1
- package/dist/{node/WranglerDevServer → wrangler}/WranglerDevServer.d.ts +6 -6
- package/dist/wrangler/WranglerDevServer.d.ts.map +1 -0
- package/dist/wrangler/WranglerDevServer.js +90 -0
- package/dist/wrangler/WranglerDevServer.js.map +1 -0
- package/dist/wrangler/WranglerDevServer.test.d.ts.map +1 -0
- package/dist/wrangler/WranglerDevServer.test.js +77 -0
- package/dist/wrangler/WranglerDevServer.test.js.map +1 -0
- package/dist/wrangler/fixtures/cf-worker.d.ts.map +1 -0
- package/dist/wrangler/fixtures/cf-worker.js.map +1 -0
- package/dist/wrangler/mod.d.ts +2 -0
- package/dist/wrangler/mod.d.ts.map +1 -0
- package/dist/wrangler/mod.js +2 -0
- package/dist/wrangler/mod.js.map +1 -0
- package/package.json +7 -4
- package/src/node/DockerComposeService/DockerComposeService.ts +50 -10
- package/src/node/mod.ts +0 -7
- package/src/node-vitest/Vitest.test.ts +12 -1
- package/src/node-vitest/Vitest.ts +31 -19
- package/src/wrangler/WranglerDevServer.test.ts +133 -0
- package/src/wrangler/WranglerDevServer.ts +180 -0
- package/src/wrangler/mod.ts +6 -0
- package/dist/node/WranglerDevServer/WranglerDevServer.d.ts.map +0 -1
- package/dist/node/WranglerDevServer/WranglerDevServer.js +0 -122
- package/dist/node/WranglerDevServer/WranglerDevServer.js.map +0 -1
- package/dist/node/WranglerDevServer/WranglerDevServer.test.d.ts.map +0 -1
- package/dist/node/WranglerDevServer/WranglerDevServer.test.js +0 -179
- package/dist/node/WranglerDevServer/WranglerDevServer.test.js.map +0 -1
- package/dist/node/WranglerDevServer/fixtures/cf-worker.d.ts.map +0 -1
- package/dist/node/WranglerDevServer/fixtures/cf-worker.js.map +0 -1
- package/dist/node/WranglerDevServer/process-tree-manager.d.ts +0 -55
- package/dist/node/WranglerDevServer/process-tree-manager.d.ts.map +0 -1
- package/dist/node/WranglerDevServer/process-tree-manager.js +0 -178
- package/dist/node/WranglerDevServer/process-tree-manager.js.map +0 -1
- package/dist/node/vitest-docker-compose-setup.d.ts +0 -32
- package/dist/node/vitest-docker-compose-setup.d.ts.map +0 -1
- package/dist/node/vitest-docker-compose-setup.js +0 -131
- package/dist/node/vitest-docker-compose-setup.js.map +0 -1
- package/dist/node/vitest-wrangler-setup.d.ts +0 -27
- package/dist/node/vitest-wrangler-setup.d.ts.map +0 -1
- package/dist/node/vitest-wrangler-setup.js +0 -96
- package/dist/node/vitest-wrangler-setup.js.map +0 -1
- package/dist/node-vitest/polyfill.d.ts +0 -2
- package/dist/node-vitest/polyfill.d.ts.map +0 -1
- package/dist/node-vitest/polyfill.js +0 -3
- package/dist/node-vitest/polyfill.js.map +0 -1
- package/src/node/WranglerDevServer/WranglerDevServer.test.ts +0 -266
- package/src/node/WranglerDevServer/WranglerDevServer.ts +0 -266
- package/src/node/WranglerDevServer/process-tree-manager.ts +0 -263
- /package/dist/{node/WranglerDevServer → wrangler}/WranglerDevServer.test.d.ts +0 -0
- /package/dist/{node/WranglerDevServer → wrangler}/fixtures/cf-worker.d.ts +0 -0
- /package/dist/{node/WranglerDevServer → wrangler}/fixtures/cf-worker.js +0 -0
- /package/src/{node/WranglerDevServer → wrangler}/fixtures/cf-worker.ts +0 -0
- /package/src/{node/WranglerDevServer → wrangler}/fixtures/wrangler.toml +0 -0
|
@@ -1,266 +0,0 @@
|
|
|
1
|
-
import * as path from 'node:path'
|
|
2
|
-
import { IS_CI } from '@livestore/utils'
|
|
3
|
-
import {
|
|
4
|
-
Command,
|
|
5
|
-
Duration,
|
|
6
|
-
Effect,
|
|
7
|
-
Exit,
|
|
8
|
-
HttpClient,
|
|
9
|
-
type PlatformError,
|
|
10
|
-
Schedule,
|
|
11
|
-
Schema,
|
|
12
|
-
Stream,
|
|
13
|
-
} from '@livestore/utils/effect'
|
|
14
|
-
import { getFreePort } from '@livestore/utils/node'
|
|
15
|
-
import { cleanupOrphanedProcesses, killProcessTree } from './process-tree-manager.ts'
|
|
16
|
-
|
|
17
|
-
/**
|
|
18
|
-
* Error type for WranglerDevServer operations
|
|
19
|
-
*/
|
|
20
|
-
export class WranglerDevServerError extends Schema.TaggedError<WranglerDevServerError>()('WranglerDevServerError', {
|
|
21
|
-
cause: Schema.Unknown,
|
|
22
|
-
message: Schema.String,
|
|
23
|
-
port: Schema.Number,
|
|
24
|
-
}) {}
|
|
25
|
-
|
|
26
|
-
/**
|
|
27
|
-
* WranglerDevServer instance interface
|
|
28
|
-
*/
|
|
29
|
-
export interface WranglerDevServer {
|
|
30
|
-
readonly port: number
|
|
31
|
-
readonly url: string
|
|
32
|
-
readonly processId: number
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
/**
|
|
36
|
-
* Configuration for starting WranglerDevServer
|
|
37
|
-
*/
|
|
38
|
-
export interface StartWranglerDevServerArgs {
|
|
39
|
-
wranglerConfigPath?: string
|
|
40
|
-
cwd: string
|
|
41
|
-
port?: number
|
|
42
|
-
/** @default false */
|
|
43
|
-
showLogs?: boolean
|
|
44
|
-
connectTimeout?: Duration.DurationInput
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
/**
|
|
48
|
-
* WranglerDevServer as an Effect.Service.
|
|
49
|
-
*
|
|
50
|
-
* This service provides the WranglerDevServer properties and can be accessed
|
|
51
|
-
* directly to get port, url, and processId.
|
|
52
|
-
*
|
|
53
|
-
* TODO: Allow for config to be passed in via code instead of `wrangler.toml` file
|
|
54
|
-
* (would need to be placed in temporary file as wrangler only accepts files as config)
|
|
55
|
-
*/
|
|
56
|
-
export class WranglerDevServerService extends Effect.Service<WranglerDevServerService>()('WranglerDevServerService', {
|
|
57
|
-
scoped: (args: StartWranglerDevServerArgs) =>
|
|
58
|
-
Effect.gen(function* () {
|
|
59
|
-
const showLogs = args.showLogs ?? false
|
|
60
|
-
|
|
61
|
-
// Clean up any orphaned processes before starting (defensive cleanup)
|
|
62
|
-
yield* cleanupOrphanedProcesses(['wrangler', 'workerd']).pipe(
|
|
63
|
-
Effect.tap((result) =>
|
|
64
|
-
showLogs && (result.cleaned.length > 0 || result.failed.length > 0)
|
|
65
|
-
? Effect.logInfo(`Cleanup result: ${result.cleaned.length} cleaned, ${result.failed.length} failed`)
|
|
66
|
-
: Effect.void,
|
|
67
|
-
),
|
|
68
|
-
Effect.ignore, // Don't fail startup if cleanup fails
|
|
69
|
-
)
|
|
70
|
-
|
|
71
|
-
// Allocate port
|
|
72
|
-
const port =
|
|
73
|
-
args.port ??
|
|
74
|
-
(yield* getFreePort.pipe(
|
|
75
|
-
Effect.mapError(
|
|
76
|
-
(cause) => new WranglerDevServerError({ cause, message: 'Failed to get free port', port: -1 }),
|
|
77
|
-
),
|
|
78
|
-
))
|
|
79
|
-
|
|
80
|
-
yield* Effect.annotateCurrentSpan({ port })
|
|
81
|
-
|
|
82
|
-
// Resolve config path
|
|
83
|
-
const configPath = path.resolve(args.wranglerConfigPath ?? path.join(args.cwd, 'wrangler.toml'))
|
|
84
|
-
|
|
85
|
-
// Start wrangler process using Effect Command
|
|
86
|
-
const process = yield* Command.make(
|
|
87
|
-
'bunx',
|
|
88
|
-
'wrangler',
|
|
89
|
-
'dev',
|
|
90
|
-
'--port',
|
|
91
|
-
port.toString(),
|
|
92
|
-
'--config',
|
|
93
|
-
configPath,
|
|
94
|
-
).pipe(
|
|
95
|
-
Command.workingDirectory(args.cwd),
|
|
96
|
-
Command.stdout('pipe'),
|
|
97
|
-
Command.stderr('pipe'),
|
|
98
|
-
Command.start,
|
|
99
|
-
Effect.catchAllCause(
|
|
100
|
-
(error) =>
|
|
101
|
-
new WranglerDevServerError({
|
|
102
|
-
cause: error,
|
|
103
|
-
message: `Failed to start wrangler process in directory: ${args.cwd}`,
|
|
104
|
-
port,
|
|
105
|
-
}),
|
|
106
|
-
),
|
|
107
|
-
Effect.withSpan('WranglerDevServerService:startProcess'),
|
|
108
|
-
)
|
|
109
|
-
|
|
110
|
-
if (showLogs) {
|
|
111
|
-
yield* process.stderr.pipe(
|
|
112
|
-
Stream.decodeText('utf8'),
|
|
113
|
-
Stream.tapLogWithLabel('wrangler:stderr'),
|
|
114
|
-
Stream.runDrain,
|
|
115
|
-
Effect.forkScoped,
|
|
116
|
-
)
|
|
117
|
-
}
|
|
118
|
-
|
|
119
|
-
const processId = process.pid
|
|
120
|
-
|
|
121
|
-
// We need to keep the `stdout` stream open, as we drain it in the waitForReady function
|
|
122
|
-
// Otherwise we'll get a EPIPE error
|
|
123
|
-
const stdout = yield* Stream.broadcastDynamic(process.stdout, 100)
|
|
124
|
-
|
|
125
|
-
// Register cleanup finalizer with intelligent timeout handling
|
|
126
|
-
yield* Effect.addFinalizer((exit) =>
|
|
127
|
-
Effect.gen(function* () {
|
|
128
|
-
const isInterrupted = Exit.isInterrupted(exit)
|
|
129
|
-
if (showLogs) {
|
|
130
|
-
yield* Effect.logDebug(`Cleaning up wrangler process ${processId}, interrupted: ${isInterrupted}`)
|
|
131
|
-
}
|
|
132
|
-
// yield* Effect.logDebug(`Cleaning up wrangler process ${processId}, interrupted: ${isInterrupted}`)
|
|
133
|
-
|
|
134
|
-
// Check if process is still running
|
|
135
|
-
const isRunning = yield* process.isRunning
|
|
136
|
-
|
|
137
|
-
if (isRunning) {
|
|
138
|
-
// Use our enhanced process tree cleanup
|
|
139
|
-
yield* killProcessTree(processId, {
|
|
140
|
-
timeout: isInterrupted ? 500 : 3000, // Fast cleanup on interruption
|
|
141
|
-
signals: ['SIGTERM', 'SIGKILL'],
|
|
142
|
-
includeRoot: true,
|
|
143
|
-
}).pipe(
|
|
144
|
-
Effect.tap((result) =>
|
|
145
|
-
showLogs
|
|
146
|
-
? Effect.logDebug(
|
|
147
|
-
`Cleaned up ${result.killedPids.length} processes, ${result.failedPids.length} failed`,
|
|
148
|
-
)
|
|
149
|
-
: Effect.void,
|
|
150
|
-
),
|
|
151
|
-
Effect.mapError(
|
|
152
|
-
(error) =>
|
|
153
|
-
new WranglerDevServerError({
|
|
154
|
-
cause: error,
|
|
155
|
-
message: `Failed to kill process tree for PID ${processId}`,
|
|
156
|
-
port: 0,
|
|
157
|
-
}),
|
|
158
|
-
),
|
|
159
|
-
Effect.ignore, // Don't fail the finalizer if cleanup has issues
|
|
160
|
-
)
|
|
161
|
-
|
|
162
|
-
// Also kill the command process handle
|
|
163
|
-
yield* process.kill()
|
|
164
|
-
} else if (showLogs) {
|
|
165
|
-
yield* Effect.logDebug(`Process ${processId} already terminated`)
|
|
166
|
-
}
|
|
167
|
-
}).pipe(
|
|
168
|
-
Effect.withSpan('WranglerDevServerService:cleanupProcess'),
|
|
169
|
-
Effect.timeout('5 seconds'), // Don't let cleanup hang forever
|
|
170
|
-
Effect.ignoreLogged,
|
|
171
|
-
),
|
|
172
|
-
)
|
|
173
|
-
|
|
174
|
-
// Wait for server to be ready
|
|
175
|
-
yield* waitForReady({ stdout, showLogs })
|
|
176
|
-
|
|
177
|
-
const url = `http://localhost:${port}`
|
|
178
|
-
|
|
179
|
-
// Use longer timeout in CI environments to account for slower startup times
|
|
180
|
-
const defaultTimeout = Duration.seconds(IS_CI ? 15 : 5)
|
|
181
|
-
yield* verifyHttpConnectivity({ url, showLogs, connectTimeout: args.connectTimeout ?? defaultTimeout })
|
|
182
|
-
|
|
183
|
-
if (showLogs) {
|
|
184
|
-
yield* Effect.logDebug(`Wrangler dev server ready and accepting connections on port ${port}`)
|
|
185
|
-
}
|
|
186
|
-
|
|
187
|
-
return {
|
|
188
|
-
port,
|
|
189
|
-
url,
|
|
190
|
-
processId,
|
|
191
|
-
} satisfies WranglerDevServer
|
|
192
|
-
}).pipe(
|
|
193
|
-
Effect.withSpan('WranglerDevServerService', {
|
|
194
|
-
attributes: { port: args.port ?? 'auto', cwd: args.cwd },
|
|
195
|
-
}),
|
|
196
|
-
),
|
|
197
|
-
}) {}
|
|
198
|
-
|
|
199
|
-
/**
|
|
200
|
-
* Waits for Wrangler server to be ready by monitoring stdout for "Ready on" message
|
|
201
|
-
*/
|
|
202
|
-
const waitForReady = ({
|
|
203
|
-
stdout,
|
|
204
|
-
showLogs,
|
|
205
|
-
}: {
|
|
206
|
-
stdout: Stream.Stream<Uint8Array, PlatformError.PlatformError, never>
|
|
207
|
-
showLogs: boolean
|
|
208
|
-
}): Effect.Effect<void, WranglerDevServerError, never> =>
|
|
209
|
-
stdout.pipe(
|
|
210
|
-
Stream.decodeText('utf8'),
|
|
211
|
-
Stream.splitLines,
|
|
212
|
-
Stream.tap((line) => (showLogs ? Effect.logDebug(`[wrangler] ${line}`) : Effect.void)),
|
|
213
|
-
Stream.takeUntil((line) => line.includes('Ready on')),
|
|
214
|
-
Stream.runDrain,
|
|
215
|
-
Effect.timeout('30 seconds'),
|
|
216
|
-
Effect.mapError(
|
|
217
|
-
(error) =>
|
|
218
|
-
new WranglerDevServerError({
|
|
219
|
-
cause: error,
|
|
220
|
-
message: 'Wrangler server failed to start within timeout',
|
|
221
|
-
port: 0,
|
|
222
|
-
}),
|
|
223
|
-
),
|
|
224
|
-
)
|
|
225
|
-
|
|
226
|
-
/**
|
|
227
|
-
* Verifies the server is actually accepting HTTP connections by making a test request
|
|
228
|
-
*/
|
|
229
|
-
const verifyHttpConnectivity = ({
|
|
230
|
-
url,
|
|
231
|
-
showLogs,
|
|
232
|
-
connectTimeout,
|
|
233
|
-
}: {
|
|
234
|
-
url: string
|
|
235
|
-
showLogs: boolean
|
|
236
|
-
connectTimeout: Duration.DurationInput
|
|
237
|
-
}): Effect.Effect<void, WranglerDevServerError, HttpClient.HttpClient> =>
|
|
238
|
-
Effect.gen(function* () {
|
|
239
|
-
const client = yield* HttpClient.HttpClient
|
|
240
|
-
|
|
241
|
-
if (showLogs) {
|
|
242
|
-
yield* Effect.logDebug(`Verifying HTTP connectivity to ${url}`)
|
|
243
|
-
}
|
|
244
|
-
|
|
245
|
-
// Try to connect with retries using exponential backoff
|
|
246
|
-
yield* client.get(url).pipe(
|
|
247
|
-
Effect.retryOrElse(
|
|
248
|
-
Schedule.exponential('50 millis', 2).pipe(
|
|
249
|
-
Schedule.jittered,
|
|
250
|
-
Schedule.intersect(Schedule.elapsed.pipe(Schedule.whileOutput(Duration.lessThanOrEqualTo(connectTimeout)))),
|
|
251
|
-
Schedule.compose(Schedule.count),
|
|
252
|
-
),
|
|
253
|
-
(error, attemptCount) =>
|
|
254
|
-
Effect.fail(
|
|
255
|
-
new WranglerDevServerError({
|
|
256
|
-
cause: error,
|
|
257
|
-
message: `Failed to establish HTTP connection to Wrangler server at ${url} after ${attemptCount} attempts (timeout: ${Duration.toMillis(connectTimeout)}ms)`,
|
|
258
|
-
port: 0,
|
|
259
|
-
}),
|
|
260
|
-
),
|
|
261
|
-
),
|
|
262
|
-
Effect.tap(() => (showLogs ? Effect.logDebug(`HTTP connectivity verified for ${url}`) : Effect.void)),
|
|
263
|
-
Effect.asVoid,
|
|
264
|
-
Effect.withSpan('verifyHttpConnectivity'),
|
|
265
|
-
)
|
|
266
|
-
})
|
|
@@ -1,263 +0,0 @@
|
|
|
1
|
-
import { Command, type CommandExecutor, Effect, Schema, type Scope, Stream } from '@livestore/utils/effect'
|
|
2
|
-
|
|
3
|
-
export class ProcessTreeError extends Schema.TaggedError<ProcessTreeError>()('ProcessTreeError', {
|
|
4
|
-
cause: Schema.Unknown,
|
|
5
|
-
message: Schema.String,
|
|
6
|
-
pid: Schema.Number,
|
|
7
|
-
}) {}
|
|
8
|
-
|
|
9
|
-
/**
|
|
10
|
-
* Finds all child processes of a given parent PID
|
|
11
|
-
*/
|
|
12
|
-
export const findChildProcesses = (
|
|
13
|
-
parentPid: number,
|
|
14
|
-
): Effect.Effect<number[], never, CommandExecutor.CommandExecutor | Scope.Scope> =>
|
|
15
|
-
Effect.gen(function* () {
|
|
16
|
-
const result = yield* Command.make('ps', '-o', 'pid,ppid', '-ax').pipe(
|
|
17
|
-
Command.start,
|
|
18
|
-
Effect.flatMap((command) =>
|
|
19
|
-
command.stdout.pipe(
|
|
20
|
-
Stream.decodeText('utf8'),
|
|
21
|
-
Stream.runCollect,
|
|
22
|
-
Effect.map((chunks) => Array.from(chunks).join('')),
|
|
23
|
-
),
|
|
24
|
-
),
|
|
25
|
-
Effect.catchAll(() => Effect.succeed('')), // Return empty string if command fails
|
|
26
|
-
)
|
|
27
|
-
|
|
28
|
-
if (!result) return []
|
|
29
|
-
|
|
30
|
-
const lines = result.split('\n')
|
|
31
|
-
const pattern = new RegExp(`^\\s*([0-9]+)\\s+${parentPid}\\s*$`)
|
|
32
|
-
|
|
33
|
-
const childPids = lines
|
|
34
|
-
.map((line) => {
|
|
35
|
-
const match = line.trim().match(pattern)
|
|
36
|
-
return match ? Number.parseInt(match[1]!, 10) : null
|
|
37
|
-
})
|
|
38
|
-
.filter((pid): pid is number => pid !== null)
|
|
39
|
-
|
|
40
|
-
return childPids
|
|
41
|
-
})
|
|
42
|
-
|
|
43
|
-
/**
|
|
44
|
-
* Recursively finds all descendants of a process
|
|
45
|
-
*/
|
|
46
|
-
export const findProcessTree = (
|
|
47
|
-
rootPid: number,
|
|
48
|
-
): Effect.Effect<number[], never, CommandExecutor.CommandExecutor | Scope.Scope> =>
|
|
49
|
-
Effect.gen(function* () {
|
|
50
|
-
const allPids = new Set<number>([rootPid])
|
|
51
|
-
const toProcess = [rootPid]
|
|
52
|
-
|
|
53
|
-
while (toProcess.length > 0) {
|
|
54
|
-
const currentPid = toProcess.pop()!
|
|
55
|
-
const children = yield* findChildProcesses(currentPid)
|
|
56
|
-
|
|
57
|
-
for (const childPid of children) {
|
|
58
|
-
if (!allPids.has(childPid)) {
|
|
59
|
-
allPids.add(childPid)
|
|
60
|
-
toProcess.push(childPid)
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
|
|
65
|
-
return Array.from(allPids)
|
|
66
|
-
})
|
|
67
|
-
|
|
68
|
-
/**
|
|
69
|
-
* Checks if a process is running
|
|
70
|
-
*/
|
|
71
|
-
export const isProcessRunning = (pid: number): Effect.Effect<boolean, never, never> =>
|
|
72
|
-
Effect.sync(() => {
|
|
73
|
-
try {
|
|
74
|
-
process.kill(pid, 0)
|
|
75
|
-
return true
|
|
76
|
-
} catch {
|
|
77
|
-
return false
|
|
78
|
-
}
|
|
79
|
-
})
|
|
80
|
-
|
|
81
|
-
/**
|
|
82
|
-
* Kills a process tree with escalating signals
|
|
83
|
-
*/
|
|
84
|
-
export const killProcessTree = (
|
|
85
|
-
rootPid: number,
|
|
86
|
-
options: {
|
|
87
|
-
timeout?: number
|
|
88
|
-
signals?: NodeJS.Signals[]
|
|
89
|
-
includeRoot?: boolean
|
|
90
|
-
} = {},
|
|
91
|
-
): Effect.Effect<
|
|
92
|
-
{ killedPids: number[]; failedPids: number[] },
|
|
93
|
-
never,
|
|
94
|
-
CommandExecutor.CommandExecutor | Scope.Scope
|
|
95
|
-
> =>
|
|
96
|
-
Effect.gen(function* () {
|
|
97
|
-
const { timeout = 5000, signals = ['SIGTERM', 'SIGKILL'], includeRoot = true } = options
|
|
98
|
-
|
|
99
|
-
// Find all processes in the tree
|
|
100
|
-
const allPids = yield* findProcessTree(rootPid)
|
|
101
|
-
const pidsToKill = includeRoot ? allPids : allPids.filter((pid) => pid !== rootPid)
|
|
102
|
-
|
|
103
|
-
if (pidsToKill.length === 0) {
|
|
104
|
-
return { killedPids: [], failedPids: [] }
|
|
105
|
-
}
|
|
106
|
-
|
|
107
|
-
const killedPids: number[] = []
|
|
108
|
-
const failedPids: number[] = []
|
|
109
|
-
|
|
110
|
-
// Try each signal with timeout
|
|
111
|
-
for (const signal of signals) {
|
|
112
|
-
// Check which processes are still running and not yet killed
|
|
113
|
-
const stillRunningChecks = yield* Effect.all(
|
|
114
|
-
pidsToKill
|
|
115
|
-
.filter((pid) => !killedPids.includes(pid))
|
|
116
|
-
.map((pid) => isProcessRunning(pid).pipe(Effect.map((running) => ({ pid, running })))),
|
|
117
|
-
)
|
|
118
|
-
const remainingPids = stillRunningChecks.filter(({ running }) => running).map(({ pid }) => pid)
|
|
119
|
-
|
|
120
|
-
if (remainingPids.length === 0) break
|
|
121
|
-
|
|
122
|
-
// Send signal to all remaining processes
|
|
123
|
-
for (const pid of remainingPids) {
|
|
124
|
-
yield* Effect.sync(() => {
|
|
125
|
-
try {
|
|
126
|
-
process.kill(pid, signal)
|
|
127
|
-
} catch {
|
|
128
|
-
// Process might already be dead, continue
|
|
129
|
-
}
|
|
130
|
-
})
|
|
131
|
-
}
|
|
132
|
-
|
|
133
|
-
// Wait for processes to terminate with polling
|
|
134
|
-
const waitStart = Date.now()
|
|
135
|
-
while (Date.now() - waitStart < timeout) {
|
|
136
|
-
const runningChecks = yield* Effect.all(
|
|
137
|
-
remainingPids.map((pid) => isProcessRunning(pid).pipe(Effect.map((running) => ({ pid, running })))),
|
|
138
|
-
)
|
|
139
|
-
const stillRunning = runningChecks.filter(({ running }) => running).map(({ pid }) => pid)
|
|
140
|
-
|
|
141
|
-
if (stillRunning.length === 0) {
|
|
142
|
-
// All processes terminated
|
|
143
|
-
killedPids.push(...remainingPids)
|
|
144
|
-
break
|
|
145
|
-
}
|
|
146
|
-
|
|
147
|
-
// Short sleep before checking again
|
|
148
|
-
yield* Effect.sleep('100 millis')
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
|
|
152
|
-
// Check final status
|
|
153
|
-
const finalChecks = yield* Effect.all(
|
|
154
|
-
pidsToKill.map((pid) => isProcessRunning(pid).pipe(Effect.map((running) => ({ pid, running })))),
|
|
155
|
-
)
|
|
156
|
-
|
|
157
|
-
for (const { pid, running } of finalChecks) {
|
|
158
|
-
if (!killedPids.includes(pid) && running) {
|
|
159
|
-
failedPids.push(pid)
|
|
160
|
-
}
|
|
161
|
-
}
|
|
162
|
-
|
|
163
|
-
return { killedPids, failedPids }
|
|
164
|
-
})
|
|
165
|
-
|
|
166
|
-
/**
|
|
167
|
-
* Finds orphaned processes by name pattern
|
|
168
|
-
*/
|
|
169
|
-
export const findOrphanedProcesses = (
|
|
170
|
-
namePattern: string,
|
|
171
|
-
): Effect.Effect<number[], never, CommandExecutor.CommandExecutor | Scope.Scope> =>
|
|
172
|
-
Effect.gen(function* () {
|
|
173
|
-
// Find processes that match the pattern and have init (PID 1) as parent
|
|
174
|
-
const result = yield* Command.make('ps', '-eo', 'pid,ppid,comm').pipe(
|
|
175
|
-
Command.start,
|
|
176
|
-
Effect.flatMap((command) =>
|
|
177
|
-
command.stdout.pipe(
|
|
178
|
-
Stream.decodeText('utf8'),
|
|
179
|
-
Stream.runCollect,
|
|
180
|
-
Effect.map((chunks) => Array.from(chunks).join('')),
|
|
181
|
-
),
|
|
182
|
-
),
|
|
183
|
-
Effect.catchAll(() => Effect.succeed('')), // Return empty string if command fails
|
|
184
|
-
)
|
|
185
|
-
|
|
186
|
-
if (!result) return []
|
|
187
|
-
|
|
188
|
-
const lines = result.split('\n')
|
|
189
|
-
const patternRegex = new RegExp(namePattern)
|
|
190
|
-
const parentRegex = /^\s*(\d+)\s+1\s+/
|
|
191
|
-
|
|
192
|
-
const orphanedPids = lines
|
|
193
|
-
.filter((line) => patternRegex.test(line))
|
|
194
|
-
.map((line) => {
|
|
195
|
-
const match = line.trim().match(parentRegex)
|
|
196
|
-
return match ? Number.parseInt(match[1]!, 10) : null
|
|
197
|
-
})
|
|
198
|
-
.filter((pid): pid is number => pid !== null)
|
|
199
|
-
|
|
200
|
-
return orphanedPids
|
|
201
|
-
})
|
|
202
|
-
|
|
203
|
-
/**
|
|
204
|
-
* Defensive cleanup for orphaned processes matching given patterns.
|
|
205
|
-
*
|
|
206
|
-
* This function provides fallback cleanup for edge cases where normal process
|
|
207
|
-
* termination mechanisms fail (e.g., hard crashes, SIGKILL before cleanup runs,
|
|
208
|
-
* or limitations in synchronous exit handlers). While proper process tree cleanup
|
|
209
|
-
* should prevent orphans in most cases, this serves as a safety net for scenarios
|
|
210
|
-
* where child processes become orphaned despite cleanup efforts.
|
|
211
|
-
*
|
|
212
|
-
* @param processPatterns - Array of process name patterns to search for (e.g., ['wrangler', 'workerd'])
|
|
213
|
-
* @returns Object with arrays of successfully cleaned and failed PIDs
|
|
214
|
-
*/
|
|
215
|
-
export const cleanupOrphanedProcesses = (
|
|
216
|
-
processPatterns: string[],
|
|
217
|
-
): Effect.Effect<{ cleaned: number[]; failed: number[] }, never, CommandExecutor.CommandExecutor | Scope.Scope> =>
|
|
218
|
-
Effect.gen(function* () {
|
|
219
|
-
const cleaned: number[] = []
|
|
220
|
-
const failed: number[] = []
|
|
221
|
-
|
|
222
|
-
// Find all orphaned processes matching the patterns
|
|
223
|
-
const allOrphanedPids: number[] = []
|
|
224
|
-
const patternCounts: Record<string, number> = {}
|
|
225
|
-
|
|
226
|
-
for (const pattern of processPatterns) {
|
|
227
|
-
const orphaned = yield* findOrphanedProcesses(pattern)
|
|
228
|
-
allOrphanedPids.push(...orphaned)
|
|
229
|
-
patternCounts[pattern] = orphaned.length
|
|
230
|
-
}
|
|
231
|
-
|
|
232
|
-
if (allOrphanedPids.length === 0) {
|
|
233
|
-
return { cleaned, failed }
|
|
234
|
-
}
|
|
235
|
-
|
|
236
|
-
const patternSummary = Object.entries(patternCounts)
|
|
237
|
-
.map(([pattern, count]) => `${count} ${pattern}`)
|
|
238
|
-
.join(', ')
|
|
239
|
-
|
|
240
|
-
yield* Effect.logInfo(
|
|
241
|
-
`Found ${allOrphanedPids.length} orphaned processes (${patternSummary}): ${allOrphanedPids.join(', ')}`,
|
|
242
|
-
)
|
|
243
|
-
|
|
244
|
-
for (const pid of allOrphanedPids) {
|
|
245
|
-
const result = yield* killProcessTree(pid, {
|
|
246
|
-
timeout: 2000,
|
|
247
|
-
signals: ['SIGTERM', 'SIGKILL'],
|
|
248
|
-
includeRoot: true,
|
|
249
|
-
}).pipe(Effect.orElse(() => Effect.succeed({ killedPids: [], failedPids: [pid] })))
|
|
250
|
-
|
|
251
|
-
if (result.failedPids.length === 0) {
|
|
252
|
-
cleaned.push(...result.killedPids)
|
|
253
|
-
yield* Effect.logInfo(
|
|
254
|
-
`Cleaned up orphaned process tree starting with ${pid} (${result.killedPids.length} processes)`,
|
|
255
|
-
)
|
|
256
|
-
} else {
|
|
257
|
-
failed.push(pid, ...result.failedPids)
|
|
258
|
-
yield* Effect.logWarning(`Failed to clean up some processes in tree ${pid}: ${result.failedPids.join(', ')}`)
|
|
259
|
-
}
|
|
260
|
-
}
|
|
261
|
-
|
|
262
|
-
return { cleaned, failed }
|
|
263
|
-
})
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|