Skip to content

Commit ff38bbe

Browse files
authored
refactor(desktop): remove configureEnv callback from spawnLocalServer (anomalyco#27022)
1 parent 2481dde commit ff38bbe

2 files changed

Lines changed: 11 additions & 19 deletions

File tree

packages/desktop/src/main/index.ts

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -291,25 +291,19 @@ const main = Effect.gen(function* () {
291291
if (mainWindow) sendSqliteMigrationProgress(mainWindow, progress)
292292
})
293293

294+
ensureLoopbackNoProxy()
295+
useEnvProxy()
296+
294297
logger.log("spawning sidecar", { url })
295298
const { listener, health } = yield* Effect.promise(() =>
296-
spawnLocalServer(
297-
hostname,
298-
port,
299-
password,
300-
() => {
301-
ensureLoopbackNoProxy()
302-
useEnvProxy()
303-
},
304-
{
305-
needsMigration,
306-
userDataPath: app.getPath("userData"),
307-
onSqliteProgress: (progress) => initEmitter.emit("sqlite", progress),
308-
onStdout: (message) => logger.log("sidecar stdout", { message }),
309-
onStderr: (message) => logger.warn("sidecar stderr", { message }),
310-
onExit: (code) => logger.warn("sidecar exited", { code }),
311-
},
312-
),
299+
spawnLocalServer(hostname, port, password, {
300+
needsMigration,
301+
userDataPath: app.getPath("userData"),
302+
onSqliteProgress: (progress) => initEmitter.emit("sqlite", progress),
303+
onStdout: (message) => logger.log("sidecar stdout", { message }),
304+
onStderr: (message) => logger.warn("sidecar stderr", { message }),
305+
onExit: (code) => logger.warn("sidecar exited", { code }),
306+
}),
313307
)
314308
server = listener
315309
yield* Deferred.succeed(serverReady, {

packages/desktop/src/main/server.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,8 @@ export async function spawnLocalServer(
7070
hostname: string,
7171
port: number,
7272
password: string,
73-
configureEnv: () => void,
7473
options: SpawnLocalServerOptions,
7574
) {
76-
configureEnv?.()
7775
const sidecar = join(dirname(fileURLToPath(import.meta.url)), "sidecar.js")
7876
const child = utilityProcess.fork(sidecar, [], {
7977
cwd: process.cwd(),

0 commit comments

Comments
 (0)