summaryrefslogtreecommitdiffhomepage
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/app/src/app.tsx2
-rw-r--r--packages/app/src/components/terminal.tsx9
-rw-r--r--packages/desktop/src-tauri/src/lib.rs2
3 files changed, 8 insertions, 5 deletions
diff --git a/packages/app/src/app.tsx b/packages/app/src/app.tsx
index 3f8080972..d0678dc53 100644
--- a/packages/app/src/app.tsx
+++ b/packages/app/src/app.tsx
@@ -33,7 +33,7 @@ const Loading = () => <div class="size-full flex items-center justify-center tex
declare global {
interface Window {
- __OPENCODE__?: { updaterEnabled?: boolean }
+ __OPENCODE__?: { updaterEnabled?: boolean; serverPassword?: string }
}
}
diff --git a/packages/app/src/components/terminal.tsx b/packages/app/src/components/terminal.tsx
index 770202f26..8001e2caa 100644
--- a/packages/app/src/components/terminal.tsx
+++ b/packages/app/src/components/terminal.tsx
@@ -100,9 +100,12 @@ export const Terminal = (props: TerminalProps) => {
const mod = await import("ghostty-web")
ghostty = await mod.Ghostty.load()
- const socket = new WebSocket(
- sdk.url + `/pty/${local.pty.id}/connect?directory=${encodeURIComponent(sdk.directory)}`,
- )
+ const url = new URL(sdk.url + `/pty/${local.pty.id}/connect?directory=${encodeURIComponent(sdk.directory)}`)
+ if (window.__OPENCODE__?.serverPassword) {
+ url.username = "opencode"
+ url.password = window.__OPENCODE__?.serverPassword
+ }
+ const socket = new WebSocket(url)
ws = socket
const t = new mod.Terminal({
diff --git a/packages/desktop/src-tauri/src/lib.rs b/packages/desktop/src-tauri/src/lib.rs
index 183220d16..4bb7b21ec 100644
--- a/packages/desktop/src-tauri/src/lib.rs
+++ b/packages/desktop/src-tauri/src/lib.rs
@@ -441,7 +441,7 @@ async fn spawn_local_server(
let timestamp = Instant::now();
loop {
- if timestamp.elapsed() > Duration::from_secs(7) {
+ if timestamp.elapsed() > Duration::from_secs(30) {
break Err(format!(
"Failed to spawn OpenCode Server. Logs:\n{}",
get_logs(app.clone()).await.unwrap()