Skip to content

Commit 3d9d25e

Browse files
committed
fix: fail on windows
1 parent ebcb6ef commit 3d9d25e

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/caddy/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { join } from 'node:path'
22
import process from 'node:process'
33

44
const TEMP_DIR = process.env.TEMP || process.env.TMPDIR || '/tmp'
5-
export const caddyPath = join(TEMP_DIR, 'caddy')
5+
export const caddyPath = join(TEMP_DIR, `caddy${process.platform === 'win32' ? '.exe' : ''}`)
66
export const caddyFilePath = join(TEMP_DIR, 'CADDYFILE')
77

88
export const supportList = [

src/caddy/index.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function testCaddy() {
6464
if (!existsSync(caddyPath))
6565
return resolve(false)
6666
chmodSync(caddyPath, 0o755)
67-
const child = spawn('sudo', [caddyPath])
67+
const child = process.platform === 'win32' ? spawn(caddyPath, []) : spawn('sudo', [caddyPath])
6868
child.on('error', (err) => {
6969
reject(err)
7070
})
@@ -167,10 +167,14 @@ export class CaddyInstant {
167167

168168
if (await tryPort(443))
169169
await kill(443, 'tcp')
170+
if (await tryPort(80))
171+
await kill(80, 'tcp')
170172

171173
return new Promise<() => Promise<void>>((resolve, reject) => {
172174
// caddy reverse-proxy --from target --to source --internal-certs
173-
const child = spawn('sudo', [caddyPath, 'reverse-proxy', '--from', `${target.split(':')[0]}`, '--to', `${source}`, '--internal-certs'])
175+
const child = process.platform !== 'win32'
176+
? spawn('sudo', [caddyPath, 'reverse-proxy', '--from', `${target.split(':')[0]}`, '--to', `${source}`, '--internal-certs'])
177+
: spawn(caddyPath, ['reverse-proxy', '--from', `${target.split(':')[0]}`, '--to', `${source}`, '--internal-certs'])
174178

175179
child.on('error', (err) => {
176180
return reject(err)

0 commit comments

Comments
 (0)