abbyswag/qwen-code
1
0
Fork 0
mirror of https://github.com/QwenLM/qwen-code.git synced 2025-12-20 08:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes to proxy on macos: prevent curl from hanging during wait-for-proxy by adding ipv6 support and timeout (#947)

Browse Source
This commit is contained in:
Olcan
2025-06-11 11:31:38 -07:00
committed by GitHub
parent 03bc1f3141
commit f75c48323c
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/cli/src/utils/sandbox-macos-permissive-proxied.sb
View File

@@ -24,7 +24,7 @@
;; deny all outbound network traffic EXCEPT through proxy on localhost:8877
;; set `GEMINI_SANDBOX_PROXY_COMMAND=<command>` to run proxy alongside sandbox
;; proxy must listen on 0.0.0.0:8877 (see scripts/example-proxy.js)
;; proxy must listen on :::8877 (see scripts/example-proxy.js)
(deny network-outbound)
(allow network-outbound (remote tcp "localhost:8877"))

2
packages/cli/src/utils/sandbox-macos-restrictive-proxied.sb
View File

@@ -88,5 +88,5 @@
;; allow outbound network traffic through proxy on localhost:8877
;; set `GEMINI_SANDBOX_PROXY_COMMAND=<command>` to run proxy alongside sandbox
;; proxy must listen on 0.0.0.0:8877 (see scripts/example-proxy.js)
;; proxy must listen on :::8877 (see scripts/example-proxy.js)
(allow network-outbound (remote tcp "localhost:8877"))

6
packages/cli/src/utils/sandbox.ts
View File

@@ -339,7 +339,7 @@ export async function start_sandbox(sandbox: string) {
});
console.log('waiting for proxy to start ...');
await execAsync(
`until curl -s http://localhost:8877; do sleep 0.25; done`,
`until timeout 0.25 curl -s http://localhost:8877; do sleep 0.25; done`,
);
}
// spawn child and let it inherit stdio
@@ -661,7 +661,9 @@ export async function start_sandbox(sandbox: string) {
process.exit(1);
});
console.log('waiting for proxy to start ...');
await execAsync(`until curl -s http://localhost:8877; do sleep 0.25; done`);
await execAsync(
`until timeout 0.25 curl -s http://localhost:8877; do sleep 0.25; done`,
);
// connect proxy container to sandbox network
// (workaround for older versions of docker that don't support multiple --network args)
await execAsync(