Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(mobile): retain invitation expiry while relay is unavailable
DavidShen3cb5a5c3351f
diff --git a/apps/mobile/app/shared-session.tsx b/apps/mobile/app/shared-session.tsxindex 98b6146ac0..0a068080a1 100644--- a/apps/mobile/app/shared-session.tsx+++ b/apps/mobile/app/shared-session.tsx@@ -41,7 +41,7 @@ export default function SharedSessionScreen() {const { colors } = useTheme();const styles = useThemedStyles(makeStyles);const [invitation, setInvitation] = useState('');- const [incomingLink, setIncomingLink] = useState<{ link: string; owner: ReturnType<typeof getMobileAuthOwner> } | null>(null);+ const [incomingLink, setIncomingLink] = useState<{ link: string; owner: ReturnType<typeof getMobileAuthOwner>; expiresAt: number } | null>(null);const [state, setState] = useState<SharedTaskHostState | null>(null);const [ownedTargetUnavailable, setOwnedTargetUnavailable] = useState(false);const [owned, setOwned] = useState<SharedTaskListItem[]>([]);@@ -240,12 +240,27 @@ export default function SharedSessionScreen() {// Claim before waiting for relay capability. Leaving this screen discards the invitation.epoch.current++; pending.current = false; setBusy(false);setJoinedId(undefined); setState(null); setEnded(false); setTab('current');- setIncomingLink({ link: input, owner: getMobileAuthOwner() });+ setIncomingLink({ link: input, owner: getMobileAuthOwner(), expiresAt: incomingInvitation.expiresAt });clearSharedTaskInvitationIntent();setInvitation(input);}, [incomingInvitation, isAuthenticated, sessionId, deviceId, sharedTaskId]);useEffect(() => {- if (!incomingLink || !isMobileAuthOwnerCurrent(incomingLink.owner) || !isAuthenticated || link.sharedTaskAvailable !== true || guestId || pending.current) return;+ if (!incomingLink) return;+ // Claiming the intent transfers its original deadline; waiting for capability+ // must not extend the invitation's in-memory lifetime.+ const timer = setTimeout(() => {+ setIncomingLink(null); setInvitation(''); setNotice(t('sharedTask.invitationUnavailable'));+ }, Math.max(0, incomingLink.expiresAt - Date.now()));+ return () => clearTimeout(timer);+ }, [incomingLink, t]);+ useEffect(() => {+ if (!incomingLink) return;+ // Timers can be suspended in the background; check before any automatic join.+ if (Date.now() >= incomingLink.expiresAt) {+ setIncomingLink(null); setInvitation(''); setNotice(t('sharedTask.invitationUnavailable'));+ return;+ }+ if (!isMobileAuthOwnerCurrent(incomingLink.owner) || !isAuthenticated || link.sharedTaskAvailable !== true || guestId || pending.current) return;setIncomingLink(null);joinInvitation(incomingLink.link, true);});diff --git a/apps/mobile/src/__tests__/sharedTaskFlow.test.tsx b/apps/mobile/src/__tests__/sharedTaskFlow.test.tsxindex 19bd5fa1a2..276f49c885 100644--- a/apps/mobile/src/__tests__/sharedTaskFlow.test.tsx+++ b/apps/mobile/src/__tests__/sharedTaskFlow.test.tsx@@ -158,6 +158,42 @@ it('claims a received invitation while capability loads, then joins and enters osessionId: 'task', deviceId: sharedTaskHostPeer('shared', 'desktop'), deviceName: 'Design review',} });});+it('retains the original expiry when a link is claimed while relay capability loads', async () => {+ h.link.sharedTaskAvailable = false;+ receiveSharedTaskInvitationIntent(invitationIntent);+ await act(async () => { await vi.advanceTimersByTimeAsync(14 * 60_000); });+ await render();+ expect(getPendingSharedTaskInvitationIntent()).toBeNull();+ await act(async () => { await vi.advanceTimersByTimeAsync(60_000); });+ h.link.sharedTaskAvailable = true;+ await render();+ expect(h.api.join).not.toHaveBeenCalled();+ expect(h.router.replace).not.toHaveBeenCalled();+ expect(element.textContent).toContain('sharedTask.invitationUnavailable');+ expect((element.querySelector('[aria-label="sharedTask.invitation"]') as HTMLTextAreaElement).value).toBe('');+});+it('rejects an expired claimed link even when its timeout has not run in the background', async () => {+ h.link.sharedTaskAvailable = false;+ receiveSharedTaskInvitationIntent(invitationIntent);+ await render();+ vi.setSystemTime(Date.now() + 15 * 60_000);+ h.link.sharedTaskAvailable = true;+ await render();+ expect(h.api.join).not.toHaveBeenCalled();+ expect(h.router.replace).not.toHaveBeenCalled();+ expect(element.textContent).toContain('sharedTask.invitationUnavailable');+});+it('does not let the previous claimed link expiry discard a newer invitation', async () => {+ h.link.sharedTaskAvailable = false;+ receiveSharedTaskInvitationIntent(invitationIntent);+ await render();+ await act(async () => { await vi.advanceTimersByTimeAsync(14 * 60_000); });+ await act(async () => { receiveSharedTaskInvitationIntent(invitationIntent.replace('A'.repeat(43), 'B'.repeat(43))); });+ await act(async () => { await vi.advanceTimersByTimeAsync(60_000); });+ h.link.sharedTaskAvailable = true;+ await render();+ expect(h.api.join).toHaveBeenCalledExactlyOnceWith('B'.repeat(43), 'Account Guest');+});it('does not carry a claimed invitation across an account change', async () => {h.link.sharedTaskAvailable = false;receiveSharedTaskInvitationIntent(invitationIntent);diff --git a/apps/mobile/src/device-link/sharedTaskInvitationIntent.ts b/apps/mobile/src/device-link/sharedTaskInvitationIntent.tsindex e0e6cfefac..36e6cb293b 100644--- a/apps/mobile/src/device-link/sharedTaskInvitationIntent.ts+++ b/apps/mobile/src/device-link/sharedTaskInvitationIntent.ts@@ -2,7 +2,7 @@ import { useSyncExternalStore } from 'react';import { parseSharedTaskInvitationIntent, type SharedTaskInvitationIntent } from '@cindy/device-link';import { getMobileAuthOwner, isMobileAuthOwnerCurrent, subscribeMobileAuthOwner } from '@/auth/authOwnerGeneration';-let pending: (SharedTaskInvitationIntent & { id: number; source: 'link' | 'clipboard' }) | null = null;+let pending: (SharedTaskInvitationIntent & { id: number; source: 'link' | 'clipboard'; expiresAt: number }) | null = null;let sequence = 0;let stopWatching: (() => void) | undefined;let expiry: ReturnType<typeof setTimeout> | undefined;@@ -23,7 +23,7 @@ export function receiveSharedTaskInvitationIntent(url: string, source: 'link' |clearSharedTaskInvitationIntent();let owner = getMobileAuthOwner();if (owner.switching) return true;- pending = { ...value, id: ++sequence, source };+ pending = { ...value, id: ++sequence, source, expiresAt: Date.now() + 15 * 60_000 };stopWatching = subscribeMobileAuthOwner(() => {const next = getMobileAuthOwner();if (next.switching || (owner.accountKey && !isMobileAuthOwnerCurrent(owner))) clearSharedTaskInvitationIntent();