No shared server access yet.
+ ) : ( ++ Anyone with an active grant can connect until you revoke it. Revoking shared access + disconnects active clients immediately. +
+ ) : null} +- Generate a pairing URL for the web client or another Orca client. + Create a revocable access grant so a browser or another Orca client can connect.
{description}
: null}
{value}
@@ -54,14 +61,33 @@ function GeneratedUrlRow({
)
}
+function UnavailableUrlRow({
+ label,
+ description
+}: {
+ label: string
+ description: string
+}): React.JSX.Element {
+ return (
+
+
+
+ {description}
+
+
+ )
+}
+
type RuntimePairingUrlGeneratorProps = {
framed?: boolean
showHeader?: boolean
+ showGeneratorForm?: boolean
}
export function RuntimePairingUrlGenerator({
framed = true,
- showHeader = true
+ showHeader = true,
+ showGeneratorForm = true
}: RuntimePairingUrlGeneratorProps): React.JSX.Element {
const [networkInterfaces, setNetworkInterfaces] = useState<{ name: string; address: string }[]>(
[]
@@ -74,8 +100,40 @@ export function RuntimePairingUrlGenerator({
const [webClientUrl, setWebClientUrl] = useState(
runtimePairingUrlCache.webClientUrl
)
+ const [runtimePairingDeviceId, setRuntimePairingDeviceId] = useState(
+ runtimePairingUrlCache.runtimePairingDeviceId
+ )
+ const [runtimeAccessGrants, setRuntimeAccessGrants] = useState([])
+ const [isLoadingAccessGrants, setIsLoadingAccessGrants] = useState(false)
+ const [revokingGrantId, setRevokingGrantId] = useState(null)
const [copiedTarget, setCopiedTarget] = useState<'web' | 'pairing' | null>(null)
const [isGeneratingPairing, setIsGeneratingPairing] = useState(false)
+ const accessGrantLoadIdRef = useRef(0)
+
+ const loadRuntimeAccessGrants = useCallback(
+ async (options: { showToastOnError?: boolean } = {}): Promise => {
+ const loadId = accessGrantLoadIdRef.current + 1
+ accessGrantLoadIdRef.current = loadId
+ setIsLoadingAccessGrants(true)
+ try {
+ const result = await window.api.mobile.listRuntimeAccessGrants()
+ if (loadId === accessGrantLoadIdRef.current) {
+ setRuntimeAccessGrants(result.grants)
+ }
+ } catch (error) {
+ if (loadId === accessGrantLoadIdRef.current && options.showToastOnError) {
+ toast.error(
+ error instanceof Error ? error.message : 'Failed to load shared access grants.'
+ )
+ }
+ } finally {
+ if (loadId === accessGrantLoadIdRef.current) {
+ setIsLoadingAccessGrants(false)
+ }
+ }
+ },
+ []
+ )
useEffect(() => {
let stale = false
@@ -98,6 +156,22 @@ export function RuntimePairingUrlGenerator({
}
}, [])
+ useEffect(() => {
+ void loadRuntimeAccessGrants()
+ return () => {
+ accessGrantLoadIdRef.current += 1
+ }
+ }, [loadRuntimeAccessGrants])
+
+ const clearGeneratedUrls = (): void => {
+ runtimePairingUrlCache.runtimePairingUrl = null
+ runtimePairingUrlCache.webClientUrl = null
+ runtimePairingUrlCache.runtimePairingDeviceId = null
+ setRuntimePairingUrl(null)
+ setWebClientUrl(null)
+ setRuntimePairingDeviceId(null)
+ }
+
const generateRuntimePairingUrl = async (): Promise => {
setIsGeneratingPairing(true)
try {
@@ -107,17 +181,17 @@ export function RuntimePairingUrlGenerator({
rotate: true
})
if (!result.available) {
- runtimePairingUrlCache.runtimePairingUrl = null
- runtimePairingUrlCache.webClientUrl = null
- setRuntimePairingUrl(null)
- setWebClientUrl(null)
+ clearGeneratedUrls()
toast.error('Runtime pairing is unavailable.')
return
}
runtimePairingUrlCache.runtimePairingUrl = result.pairingUrl
runtimePairingUrlCache.webClientUrl = result.webClientUrl
+ runtimePairingUrlCache.runtimePairingDeviceId = result.deviceId
setRuntimePairingUrl(result.pairingUrl)
setWebClientUrl(result.webClientUrl)
+ setRuntimePairingDeviceId(result.deviceId)
+ await loadRuntimeAccessGrants()
toast.success(result.webClientUrl ? 'Generated web client URL.' : 'Generated pairing URL.')
} catch (error) {
toast.error(error instanceof Error ? error.message : 'Failed to generate pairing URL.')
@@ -126,6 +200,29 @@ export function RuntimePairingUrlGenerator({
}
}
+ const revokeRuntimeAccess = async (grant: RuntimeAccessGrant): Promise => {
+ setRevokingGrantId(grant.deviceId)
+ try {
+ const result = await window.api.mobile.revokeRuntimeAccess({ deviceId: grant.deviceId })
+ if (!result.revoked) {
+ toast.error('Shared access was already revoked.')
+ await loadRuntimeAccessGrants()
+ return
+ }
+ setRuntimeAccessGrants((current) =>
+ current.filter((entry) => entry.deviceId !== grant.deviceId)
+ )
+ if (runtimePairingDeviceId === grant.deviceId) {
+ clearGeneratedUrls()
+ }
+ toast.success('Shared access revoked.')
+ } catch (error) {
+ toast.error(error instanceof Error ? error.message : 'Failed to revoke shared access.')
+ } finally {
+ setRevokingGrantId(null)
+ }
+ }
+
const copyGeneratedUrl = async (target: 'web' | 'pairing', value: string): Promise => {
try {
await window.api.ui.writeClipboardText(value)
@@ -142,6 +239,7 @@ export function RuntimePairingUrlGenerator({
const containerClassName = framed
? 'space-y-3 rounded-lg border border-border/50 bg-muted/25 p-3'
: 'space-y-4'
+ const sharedAccessClassName = showGeneratorForm ? 'border-t border-border/40 pt-3' : ''
const updateSelectedAddress = (address: string): void => {
runtimePairingUrlCache.selectedAddress = address
@@ -157,83 +255,110 @@ export function RuntimePairingUrlGenerator({
{showHeader ? (
-
+
- Generate a runtime pairing URL for the web client or another Orca client.
+ Create a revocable access grant for browser or desktop clients.
) : null}
-
-
-
-
-
-
-
-
-
+ ) : runtimePairingUrl ? (
+ void copyGeneratedUrl('web', webClientUrl)}
- />
+ {runtimePairingUrl ? (
+ void copyGeneratedUrl('pairing', runtimePairingUrl)}
+ />
+ ) : null}
+
) : null}
- {runtimePairingUrl ? (
- void copyGeneratedUrl('pairing', runtimePairingUrl)}
- />
- ) : null}
+ void loadRuntimeAccessGrants({ showToastOnError: true })}
+ onRevoke={(grant) => void revokeRuntimeAccess(grant)}
+ />
)
}
diff --git a/src/renderer/src/web/web-preload-api.ts b/src/renderer/src/web/web-preload-api.ts
index 7079616e119..8f88f7bf08b 100644
--- a/src/renderer/src/web/web-preload-api.ts
+++ b/src/renderer/src/web/web-preload-api.ts
@@ -201,6 +201,8 @@ function createWebPreloadApi(): Partial {
getRuntimePairingUrl: () => Promise.resolve({ available: false }),
listDevices: () => Promise.resolve({ devices: [] }),
revokeDevice: () => Promise.resolve({ revoked: false }),
+ listRuntimeAccessGrants: () => Promise.resolve({ grants: [] }),
+ revokeRuntimeAccess: () => Promise.resolve({ revoked: false }),
isWebSocketReady: () => Promise.resolve({ ready: Boolean(activeEnvironment), endpoint: null })
},
telemetryTrack: () => Promise.resolve(),
diff --git a/src/shared/runtime-access-grants.ts b/src/shared/runtime-access-grants.ts
new file mode 100644
index 00000000000..522c6e808e2
--- /dev/null
+++ b/src/shared/runtime-access-grants.ts
@@ -0,0 +1,6 @@
+export type RuntimeAccessGrant = {
+ deviceId: string
+ name: string
+ createdAt: number
+ lastSeenAt: number | null
+}