-
-
-
form.change.value(event.currentTarget.value)}
- onKeyDown={keyDown}
- />
-
-
- {form.state.error()}
-
+ {language.t("server.connect.camera.starting")}}>
+ {
+ form.scan.stop()
+ void camera.refetch()
+ }}
+ onScan={form.scan.complete}
+ />
+
+ }
+ >
+
+
+
+ form.change.value(event.currentTarget.value)}
+ onKeyDown={keyDown}
+ />
+
+
+
+ {form.state.error()}
+
+
+
+
+
+ form.change.name(event.currentTarget.value)}
+ onKeyDown={keyDown}
+ />
+
+
+
+ form.change.password(event.currentTarget.value)}
+ onKeyDown={keyDown}
+ />
+
+
+
+
+
+
+ {language.t(
+ window.isSecureContext ? "server.connect.camera.unavailable" : "server.connect.camera.insecure",
+ )}
+
+
+
-
-
- form.change.name(event.currentTarget.value)}
- onKeyDown={keyDown}
- />
-
-
-
- form.change.password(event.currentTarget.value)}
- onKeyDown={keyDown}
- />
-
-
+
-
-
-
-
+
+
+
+
+
+
)
}
@@ -149,6 +213,8 @@ function createFormController(options: { onSelect?: (server: ServerConnection.Ht
mode: "list" as FormMode,
originalUrl: undefined as string | undefined,
values: { url: "", name: "", password: "" },
+ urls: [] as string[],
+ scanning: false,
error: "",
status: undefined as boolean | undefined,
})
@@ -161,6 +227,8 @@ function createFormController(options: { onSelect?: (server: ServerConnection.Ht
mode: "list",
originalUrl: undefined,
values: { url: "", name: "", password: "" },
+ urls: [],
+ scanning: false,
error: "",
status: undefined,
})
@@ -265,6 +333,16 @@ function createFormController(options: { onSelect?: (server: ServerConnection.Ht
setStore("error", "")
request.mutate()
}
+ const pair = (pairing: NonNullable
>) => {
+ healthPreview.cancel()
+ setStore({
+ values: { ...store.values, url: pairing.urls[0], password: pairing.password },
+ urls: pairing.urls,
+ scanning: false,
+ error: "",
+ })
+ request.mutate()
+ }
createEffect(() => {
if (store.mode !== "edit") return
@@ -281,6 +359,8 @@ function createFormController(options: { onSelect?: (server: ServerConnection.Ht
value: () => store.values.url,
name: () => store.values.name,
password: () => store.values.password,
+ urls: () => store.urls,
+ scanning: () => store.scanning,
error: () => store.error,
status: () => store.status,
},
@@ -289,6 +369,11 @@ function createFormController(options: { onSelect?: (server: ServerConnection.Ht
name: (value: string) => change("name", value),
password: (value: string) => change("password", value),
},
+ scan: {
+ start: () => setStore("scanning", true),
+ stop: () => setStore("scanning", false),
+ complete: pair,
+ },
start: { add: startAdd, edit: startEdit },
reset,
submit,
diff --git a/packages/app/src/servers/connect/scanner.css b/packages/app/src/servers/connect/scanner.css
new file mode 100644
index 00000000000..eb9b9c899e4
--- /dev/null
+++ b/packages/app/src/servers/connect/scanner.css
@@ -0,0 +1,41 @@
+.server-connect-scanner {
+ display: flex;
+ flex-direction: column;
+ gap: 20px;
+
+ p {
+ font-size: 13px;
+ line-height: var(--line-height-base);
+ color: var(--v2-text-text-muted);
+ }
+
+ button {
+ min-height: 44px;
+ width: 100%;
+ }
+
+ .server-connect-error {
+ color: var(--v2-state-fg-danger);
+ }
+
+ .server-connect-video {
+ position: relative;
+ aspect-ratio: 1;
+ overflow: hidden;
+ border-radius: 12px;
+ background: var(--v2-background-bg-deep);
+ }
+
+ video {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ }
+
+ .server-connect-video [role="status"] {
+ position: absolute;
+ inset: 0;
+ display: grid;
+ place-items: center;
+ }
+}
diff --git a/packages/app/src/servers/connect/scanner.tsx b/packages/app/src/servers/connect/scanner.tsx
index efb9e945b44..0e41ee7f7ca 100644
--- a/packages/app/src/servers/connect/scanner.tsx
+++ b/packages/app/src/servers/connect/scanner.tsx
@@ -4,6 +4,7 @@ import { createStore } from "solid-js/store"
import { Button } from "@opencode/ui/button"
import { useLanguage } from "@/runtime/i18n/language"
import { decodePairingCode } from "./pairing"
+import "./scanner.css"
export function PairingScanner(props: {
onScan: (value: NonNullable>) => void
diff --git a/packages/app/src/servers/connect/screen.css b/packages/app/src/servers/connect/screen.css
index a63cbcaecf9..4ed4f143bd5 100644
--- a/packages/app/src/servers/connect/screen.css
+++ b/packages/app/src/servers/connect/screen.css
@@ -41,8 +41,7 @@
color: var(--v2-text-text-muted);
}
- form,
- .server-connect-scanner {
+ form {
display: flex;
flex-direction: column;
gap: 20px;
@@ -95,25 +94,4 @@
background: var(--v2-background-bg-layer-01);
user-select: all;
}
-
- .server-connect-video {
- position: relative;
- aspect-ratio: 1;
- overflow: hidden;
- border-radius: 12px;
- background: var(--v2-background-bg-deep);
- }
-
- video {
- width: 100%;
- height: 100%;
- object-fit: cover;
- }
-
- .server-connect-video [role="status"] {
- position: absolute;
- inset: 0;
- display: grid;
- place-items: center;
- }
}
diff --git a/packages/app/src/servers/connect/screen.tsx b/packages/app/src/servers/connect/screen.tsx
index c2488728370..b860b11d8ec 100644
--- a/packages/app/src/servers/connect/screen.tsx
+++ b/packages/app/src/servers/connect/screen.tsx
@@ -1,4 +1,4 @@
-import { createResource, lazy, Show, Suspense } from "solid-js"
+import { lazy, Show, Suspense } from "solid-js"
import { createStore } from "solid-js/store"
import { useMutation } from "@tanstack/solid-query"
import { Button } from "@opencode/ui/button"
@@ -10,6 +10,7 @@ import { useCheckServerHealth } from "@/runtime/server/health"
import { useServers } from "@/runtime/server/registry"
import { serverAddress } from "./pairing"
import { isMixedContent } from "./browser"
+import { createCameraAvailability } from "./camera"
import "./screen.css"
const PairingScanner = lazy(() => import("./scanner").then((module) => ({ default: module.PairingScanner })))
@@ -19,23 +20,7 @@ export function ConnectServerScreen() {
const platform = usePlatform()
const servers = useServers()
const check = useCheckServerHealth()
- const cameraSupported =
- platform.platform === "web" && window.isSecureContext && !!navigator.mediaDevices?.getUserMedia
- const [camera, cameraActions] = createResource(
- async () => {
- if (!cameraSupported || !navigator.mediaDevices.enumerateDevices) return false
- const denied = await navigator.permissions?.query({ name: "camera" }).then(
- (permission) => permission.state === "denied",
- () => false,
- )
- if (denied) return false
- return navigator.mediaDevices.enumerateDevices().then(
- (devices) => devices.some((device) => device.kind === "videoinput"),
- () => false,
- )
- },
- { initialValue: false },
- )
+ const camera = createCameraAvailability()
const [state, setState] = createStore({ url: "", password: "", urls: [] as string[], error: "", scanning: false })
const connectionError = () =>
language.t(
@@ -78,7 +63,7 @@ export function ConnectServerScreen() {
{
setState("scanning", false)
- void cameraActions.refetch()
+ void camera.refetch()
}}
onScan={(pairing) => {
setState({
@@ -154,13 +139,15 @@ export function ConnectServerScreen() {
-
+
{language.t(
window.isSecureContext ? "server.connect.camera.unavailable" : "server.connect.camera.insecure",
diff --git a/packages/app/src/settings/settings.css b/packages/app/src/settings/settings.css
index aa18d7828d1..cfbb7cb5f1b 100644
--- a/packages/app/src/settings/settings.css
+++ b/packages/app/src/settings/settings.css
@@ -1517,6 +1517,12 @@
color: var(--v2-state-fg-danger);
}
+.settings-server-dialog-hint {
+ font-size: 13px;
+ line-height: var(--line-height-base);
+ color: var(--v2-text-text-muted);
+}
+
.settings-extensions-tabs[data-component="tabs-v2"][data-variant="pill"] > [data-slot="tabs-v2-list"] {
width: min(280px, 100%);
}