Commit fa19061

Browse files
committed
Fix registration status stuck pending and destructive teardown on unmount
- Reset a registration status left as 'pending' back to 'unknown' when the device registration effect exits without reaching the relay (signed out, missing relay config, or superseded by a newer generation). - Add a non-destructive suspend path for relay token provider teardown so CloudAuthBridge unmount and missing cloud config no longer end local Live Activities or clear the persisted registration record while the user is still signed in.
1 parent 5225bdb commit fa19061

2 files changed

Lines changed: 41 additions & 12 deletions

File tree

‎apps/mobile/src/features/agent-awareness/remoteRegistration.ts‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,30 @@ export function shouldRegisterAgentAwarenessDeviceForProvider(
143143
returnidentity===undefined||identity!==previousIdentity;
144144
}
145145

146+
functionremoveRelaySubscriptions(): void{
147+
pushToStartSubscription?.remove();
148+
pushToStartSubscription=null;
149+
pushTokenSubscription?.remove();
150+
pushTokenSubscription=null;
151+
appStateSubscription?.remove();
152+
appStateSubscription=null;
153+
if(activeLiveActivityRegistrationRetry){
154+
clearTimeout(activeLiveActivityRegistrationRetry);
155+
activeLiveActivityRegistrationRetry=null;
156+
}
157+
}
158+
159+
// Drops the relay token provider without sign-out semantics: the Clerk session
160+
// can still be valid while the auth bridge tears down (remounts, provider tree
161+
// changes, missing cloud config). Listeners stop, but local Live Activities,
162+
// the persisted registration record, and the provider identity stay intact so
163+
// re-activating the same account does not end activities or force
164+
// re-registration.
165+
exportfunctionsuspendAgentAwarenessRelayTokenProvider(): void{
166+
relayTokenProvider=null;
167+
removeRelaySubscriptions();
168+
}
169+
146170
exportfunctionsetAgentAwarenessRelayTokenProvider(
147171
provider: (()=>Promise<string|null>)|null,
148172
identity?: string,
@@ -158,16 +182,7 @@ export function setAgentAwarenessRelayTokenProvider(
158182
relayTokenProvider=provider;
159183
relayTokenProviderIdentity=provider ? (identity??null) : null;
160184
if(!provider){
161-
pushToStartSubscription?.remove();
162-
pushToStartSubscription=null;
163-
pushTokenSubscription?.remove();
164-
pushTokenSubscription=null;
165-
appStateSubscription?.remove();
166-
appStateSubscription=null;
167-
if(activeLiveActivityRegistrationRetry){
168-
clearTimeout(activeLiveActivityRegistrationRetry);
169-
activeLiveActivityRegistrationRetry=null;
170-
}
185+
removeRelaySubscriptions();
171186
// Without a signed-in user the relay can no longer update or end these
172187
// activities, so they would sit orphaned on the lock screen.
173188
endLocalLiveActivities("live activity cleanup after cloud sign-out failed");
@@ -472,6 +487,11 @@ function startPendingDeviceRegistration(): void {
472487
if(result._tag==="Failure"&&!isAtomCommandInterrupted(result)){
473488
setRegistrationStatus("failed");
474489
logRegistrationError(next.context,squashAtomCommandFailure(result));
490+
}elseif(registrationStatus==="pending"){
491+
// The registration exited without reaching the relay (signed out,
492+
// missing relay config, or superseded by a newer generation); don't
493+
// leave the status stuck on pending.
494+
setRegistrationStatus("unknown");
475495
}
476496
logRegistrationDebug("device registration finished",{ generation });
477497
if(activeDeviceRegistration===registration){

‎apps/mobile/src/features/cloud/CloudAuthProvider.tsx‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { appAtomRegistry } from "../../state/atom-registry";
1515
import{useAtomCommand}from"../../state/use-atom-command";
1616
import{
1717
setAgentAwarenessRelayTokenProvider,
18+
suspendAgentAwarenessRelayTokenProvider,
1819
unregisterAgentAwarenessDeviceForCurrentUser,
1920
}from"../agent-awareness/remoteRegistration";
2021
import{resolveCloudPublicConfig,resolveRelayClerkTokenOptions}from"./publicConfig";
@@ -32,6 +33,14 @@ export function deactivateCloudRelayAccount(): void {
3233
setManagedRelaySession(appAtomRegistry,null);
3334
}
3435

36+
// Teardown without sign-out semantics: the Clerk session may still be valid
37+
// (bridge remounts, provider tree changes, missing cloud config), so local
38+
// Live Activities and the persisted registration record must survive.
39+
exportfunctionsuspendCloudRelayAccount(): void{
40+
suspendAgentAwarenessRelayTokenProvider();
41+
setManagedRelaySession(appAtomRegistry,null);
42+
}
43+
3544
exportfunctionactivateCloudRelayAccount(
3645
accountId: string,
3746
tokenProvider: ()=>Promise<string|null>,
@@ -143,7 +152,7 @@ function CloudAuthBridge(props: { readonly children: ReactNode }) {
143152
useEffect(
144153
()=>()=>{
145154
previousTokenProviderRef.current=null;
146-
deactivateCloudRelayAccount();
155+
suspendCloudRelayAccount();
147156
},
148157
[],
149158
);
@@ -158,7 +167,7 @@ export function CloudAuthProvider(props: { readonly children: ReactNode }) {
158167

159168
useEffect(()=>{
160169
if(!publishableKey||!relayUrl){
161-
deactivateCloudRelayAccount();
170+
suspendCloudRelayAccount();
162171
}
163172
},[publishableKey,relayUrl]);
164173

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit fa19061

Browse files
committed
Fix registration status stuck pending and destructive teardown on unmount
- Reset a registration status left as 'pending' back to 'unknown' when the device registration effect exits without reaching the relay (signed out, missing relay config, or superseded by a newer generation). - Add a non-destructive suspend path for relay token provider teardown so CloudAuthBridge unmount and missing cloud config no longer end local Live Activities or clear the persisted registration record while the user is still signed in.
1 parent 5225bdb commit fa19061

2 files changed

Lines changed: 41 additions & 12 deletions

File tree

‎apps/mobile/src/features/agent-awareness/remoteRegistration.ts‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,30 @@ export function shouldRegisterAgentAwarenessDeviceForProvider(
143143
returnidentity===undefined||identity!==previousIdentity;
144144
}
145145

146+
functionremoveRelaySubscriptions(): void{
147+
pushToStartSubscription?.remove();
148+
pushToStartSubscription=null;
149+
pushTokenSubscription?.remove();
150+
pushTokenSubscription=null;
151+
appStateSubscription?.remove();
152+
appStateSubscription=null;
153+
if(activeLiveActivityRegistrationRetry){
154+
clearTimeout(activeLiveActivityRegistrationRetry);
155+
activeLiveActivityRegistrationRetry=null;
156+
}
157+
}
158+
159+
// Drops the relay token provider without sign-out semantics: the Clerk session
160+
// can still be valid while the auth bridge tears down (remounts, provider tree
161+
// changes, missing cloud config). Listeners stop, but local Live Activities,
162+
// the persisted registration record, and the provider identity stay intact so
163+
// re-activating the same account does not end activities or force
164+
// re-registration.
165+
exportfunctionsuspendAgentAwarenessRelayTokenProvider(): void{
166+
relayTokenProvider=null;
167+
removeRelaySubscriptions();
168+
}
169+
146170
exportfunctionsetAgentAwarenessRelayTokenProvider(
147171
provider: (()=>Promise<string|null>)|null,
148172
identity?: string,
@@ -158,16 +182,7 @@ export function setAgentAwarenessRelayTokenProvider(
158182
relayTokenProvider=provider;
159183
relayTokenProviderIdentity=provider ? (identity??null) : null;
160184
if(!provider){
161-
pushToStartSubscription?.remove();
162-
pushToStartSubscription=null;
163-
pushTokenSubscription?.remove();
164-
pushTokenSubscription=null;
165-
appStateSubscription?.remove();
166-
appStateSubscription=null;
167-
if(activeLiveActivityRegistrationRetry){
168-
clearTimeout(activeLiveActivityRegistrationRetry);
169-
activeLiveActivityRegistrationRetry=null;
170-
}
185+
removeRelaySubscriptions();
171186
// Without a signed-in user the relay can no longer update or end these
172187
// activities, so they would sit orphaned on the lock screen.
173188
endLocalLiveActivities("live activity cleanup after cloud sign-out failed");
@@ -472,6 +487,11 @@ function startPendingDeviceRegistration(): void {
472487
if(result._tag==="Failure"&&!isAtomCommandInterrupted(result)){
473488
setRegistrationStatus("failed");
474489
logRegistrationError(next.context,squashAtomCommandFailure(result));
490+
}elseif(registrationStatus==="pending"){
491+
// The registration exited without reaching the relay (signed out,
492+
// missing relay config, or superseded by a newer generation); don't
493+
// leave the status stuck on pending.
494+
setRegistrationStatus("unknown");
475495
}
476496
logRegistrationDebug("device registration finished",{ generation });
477497
if(activeDeviceRegistration===registration){

‎apps/mobile/src/features/cloud/CloudAuthProvider.tsx‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { appAtomRegistry } from "../../state/atom-registry";
1515
import{useAtomCommand}from"../../state/use-atom-command";
1616
import{
1717
setAgentAwarenessRelayTokenProvider,
18+
suspendAgentAwarenessRelayTokenProvider,
1819
unregisterAgentAwarenessDeviceForCurrentUser,
1920
}from"../agent-awareness/remoteRegistration";
2021
import{resolveCloudPublicConfig,resolveRelayClerkTokenOptions}from"./publicConfig";
@@ -32,6 +33,14 @@ export function deactivateCloudRelayAccount(): void {
3233
setManagedRelaySession(appAtomRegistry,null);
3334
}
3435

36+
// Teardown without sign-out semantics: the Clerk session may still be valid
37+
// (bridge remounts, provider tree changes, missing cloud config), so local
38+
// Live Activities and the persisted registration record must survive.
39+
exportfunctionsuspendCloudRelayAccount(): void{
40+
suspendAgentAwarenessRelayTokenProvider();
41+
setManagedRelaySession(appAtomRegistry,null);
42+
}
43+
3544
exportfunctionactivateCloudRelayAccount(
3645
accountId: string,
3746
tokenProvider: ()=>Promise<string|null>,
@@ -143,7 +152,7 @@ function CloudAuthBridge(props: { readonly children: ReactNode }) {
143152
useEffect(
144153
()=>()=>{
145154
previousTokenProviderRef.current=null;
146-
deactivateCloudRelayAccount();
155+
suspendCloudRelayAccount();
147156
},
148157
[],
149158
);
@@ -158,7 +167,7 @@ export function CloudAuthProvider(props: { readonly children: ReactNode }) {
158167

159168
useEffect(()=>{
160169
if(!publishableKey||!relayUrl){
161-
deactivateCloudRelayAccount();
170+
suspendCloudRelayAccount();
162171
}
163172
},[publishableKey,relayUrl]);
164173

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit fa19061

Browse files
committed
Fix registration status stuck pending and destructive teardown on unmount
- Reset a registration status left as 'pending' back to 'unknown' when the device registration effect exits without reaching the relay (signed out, missing relay config, or superseded by a newer generation). - Add a non-destructive suspend path for relay token provider teardown so CloudAuthBridge unmount and missing cloud config no longer end local Live Activities or clear the persisted registration record while the user is still signed in.
1 parent 5225bdb commit fa19061

2 files changed

Lines changed: 41 additions & 12 deletions

File tree

‎apps/mobile/src/features/agent-awareness/remoteRegistration.ts‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,30 @@ export function shouldRegisterAgentAwarenessDeviceForProvider(
143143
returnidentity===undefined||identity!==previousIdentity;
144144
}
145145

146+
functionremoveRelaySubscriptions(): void{
147+
pushToStartSubscription?.remove();
148+
pushToStartSubscription=null;
149+
pushTokenSubscription?.remove();
150+
pushTokenSubscription=null;
151+
appStateSubscription?.remove();
152+
appStateSubscription=null;
153+
if(activeLiveActivityRegistrationRetry){
154+
clearTimeout(activeLiveActivityRegistrationRetry);
155+
activeLiveActivityRegistrationRetry=null;
156+
}
157+
}
158+
159+
// Drops the relay token provider without sign-out semantics: the Clerk session
160+
// can still be valid while the auth bridge tears down (remounts, provider tree
161+
// changes, missing cloud config). Listeners stop, but local Live Activities,
162+
// the persisted registration record, and the provider identity stay intact so
163+
// re-activating the same account does not end activities or force
164+
// re-registration.
165+
exportfunctionsuspendAgentAwarenessRelayTokenProvider(): void{
166+
relayTokenProvider=null;
167+
removeRelaySubscriptions();
168+
}
169+
146170
exportfunctionsetAgentAwarenessRelayTokenProvider(
147171
provider: (()=>Promise<string|null>)|null,
148172
identity?: string,
@@ -158,16 +182,7 @@ export function setAgentAwarenessRelayTokenProvider(
158182
relayTokenProvider=provider;
159183
relayTokenProviderIdentity=provider ? (identity??null) : null;
160184
if(!provider){
161-
pushToStartSubscription?.remove();
162-
pushToStartSubscription=null;
163-
pushTokenSubscription?.remove();
164-
pushTokenSubscription=null;
165-
appStateSubscription?.remove();
166-
appStateSubscription=null;
167-
if(activeLiveActivityRegistrationRetry){
168-
clearTimeout(activeLiveActivityRegistrationRetry);
169-
activeLiveActivityRegistrationRetry=null;
170-
}
185+
removeRelaySubscriptions();
171186
// Without a signed-in user the relay can no longer update or end these
172187
// activities, so they would sit orphaned on the lock screen.
173188
endLocalLiveActivities("live activity cleanup after cloud sign-out failed");
@@ -472,6 +487,11 @@ function startPendingDeviceRegistration(): void {
472487
if(result._tag==="Failure"&&!isAtomCommandInterrupted(result)){
473488
setRegistrationStatus("failed");
474489
logRegistrationError(next.context,squashAtomCommandFailure(result));
490+
}elseif(registrationStatus==="pending"){
491+
// The registration exited without reaching the relay (signed out,
492+
// missing relay config, or superseded by a newer generation); don't
493+
// leave the status stuck on pending.
494+
setRegistrationStatus("unknown");
475495
}
476496
logRegistrationDebug("device registration finished",{ generation });
477497
if(activeDeviceRegistration===registration){

‎apps/mobile/src/features/cloud/CloudAuthProvider.tsx‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { appAtomRegistry } from "../../state/atom-registry";
1515
import{useAtomCommand}from"../../state/use-atom-command";
1616
import{
1717
setAgentAwarenessRelayTokenProvider,
18+
suspendAgentAwarenessRelayTokenProvider,
1819
unregisterAgentAwarenessDeviceForCurrentUser,
1920
}from"../agent-awareness/remoteRegistration";
2021
import{resolveCloudPublicConfig,resolveRelayClerkTokenOptions}from"./publicConfig";
@@ -32,6 +33,14 @@ export function deactivateCloudRelayAccount(): void {
3233
setManagedRelaySession(appAtomRegistry,null);
3334
}
3435

36+
// Teardown without sign-out semantics: the Clerk session may still be valid
37+
// (bridge remounts, provider tree changes, missing cloud config), so local
38+
// Live Activities and the persisted registration record must survive.
39+
exportfunctionsuspendCloudRelayAccount(): void{
40+
suspendAgentAwarenessRelayTokenProvider();
41+
setManagedRelaySession(appAtomRegistry,null);
42+
}
43+
3544
exportfunctionactivateCloudRelayAccount(
3645
accountId: string,
3746
tokenProvider: ()=>Promise<string|null>,
@@ -143,7 +152,7 @@ function CloudAuthBridge(props: { readonly children: ReactNode }) {
143152
useEffect(
144153
()=>()=>{
145154
previousTokenProviderRef.current=null;
146-
deactivateCloudRelayAccount();
155+
suspendCloudRelayAccount();
147156
},
148157
[],
149158
);
@@ -158,7 +167,7 @@ export function CloudAuthProvider(props: { readonly children: ReactNode }) {
158167

159168
useEffect(()=>{
160169
if(!publishableKey||!relayUrl){
161-
deactivateCloudRelayAccount();
170+
suspendCloudRelayAccount();
162171
}
163172
},[publishableKey,relayUrl]);
164173

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit fa19061

Browse files
committed
Fix registration status stuck pending and destructive teardown on unmount
- Reset a registration status left as 'pending' back to 'unknown' when the device registration effect exits without reaching the relay (signed out, missing relay config, or superseded by a newer generation). - Add a non-destructive suspend path for relay token provider teardown so CloudAuthBridge unmount and missing cloud config no longer end local Live Activities or clear the persisted registration record while the user is still signed in.
1 parent 5225bdb commit fa19061

2 files changed

Lines changed: 41 additions & 12 deletions

File tree

‎apps/mobile/src/features/agent-awareness/remoteRegistration.ts‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,30 @@ export function shouldRegisterAgentAwarenessDeviceForProvider(
143143
returnidentity===undefined||identity!==previousIdentity;
144144
}
145145

146+
functionremoveRelaySubscriptions(): void{
147+
pushToStartSubscription?.remove();
148+
pushToStartSubscription=null;
149+
pushTokenSubscription?.remove();
150+
pushTokenSubscription=null;
151+
appStateSubscription?.remove();
152+
appStateSubscription=null;
153+
if(activeLiveActivityRegistrationRetry){
154+
clearTimeout(activeLiveActivityRegistrationRetry);
155+
activeLiveActivityRegistrationRetry=null;
156+
}
157+
}
158+
159+
// Drops the relay token provider without sign-out semantics: the Clerk session
160+
// can still be valid while the auth bridge tears down (remounts, provider tree
161+
// changes, missing cloud config). Listeners stop, but local Live Activities,
162+
// the persisted registration record, and the provider identity stay intact so
163+
// re-activating the same account does not end activities or force
164+
// re-registration.
165+
exportfunctionsuspendAgentAwarenessRelayTokenProvider(): void{
166+
relayTokenProvider=null;
167+
removeRelaySubscriptions();
168+
}
169+
146170
exportfunctionsetAgentAwarenessRelayTokenProvider(
147171
provider: (()=>Promise<string|null>)|null,
148172
identity?: string,
@@ -158,16 +182,7 @@ export function setAgentAwarenessRelayTokenProvider(
158182
relayTokenProvider=provider;
159183
relayTokenProviderIdentity=provider ? (identity??null) : null;
160184
if(!provider){
161-
pushToStartSubscription?.remove();
162-
pushToStartSubscription=null;
163-
pushTokenSubscription?.remove();
164-
pushTokenSubscription=null;
165-
appStateSubscription?.remove();
166-
appStateSubscription=null;
167-
if(activeLiveActivityRegistrationRetry){
168-
clearTimeout(activeLiveActivityRegistrationRetry);
169-
activeLiveActivityRegistrationRetry=null;
170-
}
185+
removeRelaySubscriptions();
171186
// Without a signed-in user the relay can no longer update or end these
172187
// activities, so they would sit orphaned on the lock screen.
173188
endLocalLiveActivities("live activity cleanup after cloud sign-out failed");
@@ -472,6 +487,11 @@ function startPendingDeviceRegistration(): void {
472487
if(result._tag==="Failure"&&!isAtomCommandInterrupted(result)){
473488
setRegistrationStatus("failed");
474489
logRegistrationError(next.context,squashAtomCommandFailure(result));
490+
}elseif(registrationStatus==="pending"){
491+
// The registration exited without reaching the relay (signed out,
492+
// missing relay config, or superseded by a newer generation); don't
493+
// leave the status stuck on pending.
494+
setRegistrationStatus("unknown");
475495
}
476496
logRegistrationDebug("device registration finished",{ generation });
477497
if(activeDeviceRegistration===registration){

‎apps/mobile/src/features/cloud/CloudAuthProvider.tsx‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { appAtomRegistry } from "../../state/atom-registry";
1515
import{useAtomCommand}from"../../state/use-atom-command";
1616
import{
1717
setAgentAwarenessRelayTokenProvider,
18+
suspendAgentAwarenessRelayTokenProvider,
1819
unregisterAgentAwarenessDeviceForCurrentUser,
1920
}from"../agent-awareness/remoteRegistration";
2021
import{resolveCloudPublicConfig,resolveRelayClerkTokenOptions}from"./publicConfig";
@@ -32,6 +33,14 @@ export function deactivateCloudRelayAccount(): void {
3233
setManagedRelaySession(appAtomRegistry,null);
3334
}
3435

36+
// Teardown without sign-out semantics: the Clerk session may still be valid
37+
// (bridge remounts, provider tree changes, missing cloud config), so local
38+
// Live Activities and the persisted registration record must survive.
39+
exportfunctionsuspendCloudRelayAccount(): void{
40+
suspendAgentAwarenessRelayTokenProvider();
41+
setManagedRelaySession(appAtomRegistry,null);
42+
}
43+
3544
exportfunctionactivateCloudRelayAccount(
3645
accountId: string,
3746
tokenProvider: ()=>Promise<string|null>,
@@ -143,7 +152,7 @@ function CloudAuthBridge(props: { readonly children: ReactNode }) {
143152
useEffect(
144153
()=>()=>{
145154
previousTokenProviderRef.current=null;
146-
deactivateCloudRelayAccount();
155+
suspendCloudRelayAccount();
147156
},
148157
[],
149158
);
@@ -158,7 +167,7 @@ export function CloudAuthProvider(props: { readonly children: ReactNode }) {
158167

159168
useEffect(()=>{
160169
if(!publishableKey||!relayUrl){
161-
deactivateCloudRelayAccount();
170+
suspendCloudRelayAccount();
162171
}
163172
},[publishableKey,relayUrl]);
164173

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit fa19061

Browse files
committed
Fix registration status stuck pending and destructive teardown on unmount
- Reset a registration status left as 'pending' back to 'unknown' when the device registration effect exits without reaching the relay (signed out, missing relay config, or superseded by a newer generation). - Add a non-destructive suspend path for relay token provider teardown so CloudAuthBridge unmount and missing cloud config no longer end local Live Activities or clear the persisted registration record while the user is still signed in.
1 parent 5225bdb commit fa19061

2 files changed

Lines changed: 41 additions & 12 deletions

File tree

‎apps/mobile/src/features/agent-awareness/remoteRegistration.ts‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,30 @@ export function shouldRegisterAgentAwarenessDeviceForProvider(
143143
returnidentity===undefined||identity!==previousIdentity;
144144
}
145145

146+
functionremoveRelaySubscriptions(): void{
147+
pushToStartSubscription?.remove();
148+
pushToStartSubscription=null;
149+
pushTokenSubscription?.remove();
150+
pushTokenSubscription=null;
151+
appStateSubscription?.remove();
152+
appStateSubscription=null;
153+
if(activeLiveActivityRegistrationRetry){
154+
clearTimeout(activeLiveActivityRegistrationRetry);
155+
activeLiveActivityRegistrationRetry=null;
156+
}
157+
}
158+
159+
// Drops the relay token provider without sign-out semantics: the Clerk session
160+
// can still be valid while the auth bridge tears down (remounts, provider tree
161+
// changes, missing cloud config). Listeners stop, but local Live Activities,
162+
// the persisted registration record, and the provider identity stay intact so
163+
// re-activating the same account does not end activities or force
164+
// re-registration.
165+
exportfunctionsuspendAgentAwarenessRelayTokenProvider(): void{
166+
relayTokenProvider=null;
167+
removeRelaySubscriptions();
168+
}
169+
146170
exportfunctionsetAgentAwarenessRelayTokenProvider(
147171
provider: (()=>Promise<string|null>)|null,
148172
identity?: string,
@@ -158,16 +182,7 @@ export function setAgentAwarenessRelayTokenProvider(
158182
relayTokenProvider=provider;
159183
relayTokenProviderIdentity=provider ? (identity??null) : null;
160184
if(!provider){
161-
pushToStartSubscription?.remove();
162-
pushToStartSubscription=null;
163-
pushTokenSubscription?.remove();
164-
pushTokenSubscription=null;
165-
appStateSubscription?.remove();
166-
appStateSubscription=null;
167-
if(activeLiveActivityRegistrationRetry){
168-
clearTimeout(activeLiveActivityRegistrationRetry);
169-
activeLiveActivityRegistrationRetry=null;
170-
}
185+
removeRelaySubscriptions();
171186
// Without a signed-in user the relay can no longer update or end these
172187
// activities, so they would sit orphaned on the lock screen.
173188
endLocalLiveActivities("live activity cleanup after cloud sign-out failed");
@@ -472,6 +487,11 @@ function startPendingDeviceRegistration(): void {
472487
if(result._tag==="Failure"&&!isAtomCommandInterrupted(result)){
473488
setRegistrationStatus("failed");
474489
logRegistrationError(next.context,squashAtomCommandFailure(result));
490+
}elseif(registrationStatus==="pending"){
491+
// The registration exited without reaching the relay (signed out,
492+
// missing relay config, or superseded by a newer generation); don't
493+
// leave the status stuck on pending.
494+
setRegistrationStatus("unknown");
475495
}
476496
logRegistrationDebug("device registration finished",{ generation });
477497
if(activeDeviceRegistration===registration){

‎apps/mobile/src/features/cloud/CloudAuthProvider.tsx‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { appAtomRegistry } from "../../state/atom-registry";
1515
import{useAtomCommand}from"../../state/use-atom-command";
1616
import{
1717
setAgentAwarenessRelayTokenProvider,
18+
suspendAgentAwarenessRelayTokenProvider,
1819
unregisterAgentAwarenessDeviceForCurrentUser,
1920
}from"../agent-awareness/remoteRegistration";
2021
import{resolveCloudPublicConfig,resolveRelayClerkTokenOptions}from"./publicConfig";
@@ -32,6 +33,14 @@ export function deactivateCloudRelayAccount(): void {
3233
setManagedRelaySession(appAtomRegistry,null);
3334
}
3435

36+
// Teardown without sign-out semantics: the Clerk session may still be valid
37+
// (bridge remounts, provider tree changes, missing cloud config), so local
38+
// Live Activities and the persisted registration record must survive.
39+
exportfunctionsuspendCloudRelayAccount(): void{
40+
suspendAgentAwarenessRelayTokenProvider();
41+
setManagedRelaySession(appAtomRegistry,null);
42+
}
43+
3544
exportfunctionactivateCloudRelayAccount(
3645
accountId: string,
3746
tokenProvider: ()=>Promise<string|null>,
@@ -143,7 +152,7 @@ function CloudAuthBridge(props: { readonly children: ReactNode }) {
143152
useEffect(
144153
()=>()=>{
145154
previousTokenProviderRef.current=null;
146-
deactivateCloudRelayAccount();
155+
suspendCloudRelayAccount();
147156
},
148157
[],
149158
);
@@ -158,7 +167,7 @@ export function CloudAuthProvider(props: { readonly children: ReactNode }) {
158167

159168
useEffect(()=>{
160169
if(!publishableKey||!relayUrl){
161-
deactivateCloudRelayAccount();
170+
suspendCloudRelayAccount();
162171
}
163172
},[publishableKey,relayUrl]);
164173

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit fa19061

Browse files
committed
Fix registration status stuck pending and destructive teardown on unmount
- Reset a registration status left as 'pending' back to 'unknown' when the device registration effect exits without reaching the relay (signed out, missing relay config, or superseded by a newer generation). - Add a non-destructive suspend path for relay token provider teardown so CloudAuthBridge unmount and missing cloud config no longer end local Live Activities or clear the persisted registration record while the user is still signed in.
1 parent 5225bdb commit fa19061

2 files changed

Lines changed: 41 additions & 12 deletions

File tree

‎apps/mobile/src/features/agent-awareness/remoteRegistration.ts‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,30 @@ export function shouldRegisterAgentAwarenessDeviceForProvider(
143143
returnidentity===undefined||identity!==previousIdentity;
144144
}
145145

146+
functionremoveRelaySubscriptions(): void{
147+
pushToStartSubscription?.remove();
148+
pushToStartSubscription=null;
149+
pushTokenSubscription?.remove();
150+
pushTokenSubscription=null;
151+
appStateSubscription?.remove();
152+
appStateSubscription=null;
153+
if(activeLiveActivityRegistrationRetry){
154+
clearTimeout(activeLiveActivityRegistrationRetry);
155+
activeLiveActivityRegistrationRetry=null;
156+
}
157+
}
158+
159+
// Drops the relay token provider without sign-out semantics: the Clerk session
160+
// can still be valid while the auth bridge tears down (remounts, provider tree
161+
// changes, missing cloud config). Listeners stop, but local Live Activities,
162+
// the persisted registration record, and the provider identity stay intact so
163+
// re-activating the same account does not end activities or force
164+
// re-registration.
165+
exportfunctionsuspendAgentAwarenessRelayTokenProvider(): void{
166+
relayTokenProvider=null;
167+
removeRelaySubscriptions();
168+
}
169+
146170
exportfunctionsetAgentAwarenessRelayTokenProvider(
147171
provider: (()=>Promise<string|null>)|null,
148172
identity?: string,
@@ -158,16 +182,7 @@ export function setAgentAwarenessRelayTokenProvider(
158182
relayTokenProvider=provider;
159183
relayTokenProviderIdentity=provider ? (identity??null) : null;
160184
if(!provider){
161-
pushToStartSubscription?.remove();
162-
pushToStartSubscription=null;
163-
pushTokenSubscription?.remove();
164-
pushTokenSubscription=null;
165-
appStateSubscription?.remove();
166-
appStateSubscription=null;
167-
if(activeLiveActivityRegistrationRetry){
168-
clearTimeout(activeLiveActivityRegistrationRetry);
169-
activeLiveActivityRegistrationRetry=null;
170-
}
185+
removeRelaySubscriptions();
171186
// Without a signed-in user the relay can no longer update or end these
172187
// activities, so they would sit orphaned on the lock screen.
173188
endLocalLiveActivities("live activity cleanup after cloud sign-out failed");
@@ -472,6 +487,11 @@ function startPendingDeviceRegistration(): void {
472487
if(result._tag==="Failure"&&!isAtomCommandInterrupted(result)){
473488
setRegistrationStatus("failed");
474489
logRegistrationError(next.context,squashAtomCommandFailure(result));
490+
}elseif(registrationStatus==="pending"){
491+
// The registration exited without reaching the relay (signed out,
492+
// missing relay config, or superseded by a newer generation); don't
493+
// leave the status stuck on pending.
494+
setRegistrationStatus("unknown");
475495
}
476496
logRegistrationDebug("device registration finished",{ generation });
477497
if(activeDeviceRegistration===registration){

‎apps/mobile/src/features/cloud/CloudAuthProvider.tsx‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { appAtomRegistry } from "../../state/atom-registry";
1515
import{useAtomCommand}from"../../state/use-atom-command";
1616
import{
1717
setAgentAwarenessRelayTokenProvider,
18+
suspendAgentAwarenessRelayTokenProvider,
1819
unregisterAgentAwarenessDeviceForCurrentUser,
1920
}from"../agent-awareness/remoteRegistration";
2021
import{resolveCloudPublicConfig,resolveRelayClerkTokenOptions}from"./publicConfig";
@@ -32,6 +33,14 @@ export function deactivateCloudRelayAccount(): void {
3233
setManagedRelaySession(appAtomRegistry,null);
3334
}
3435

36+
// Teardown without sign-out semantics: the Clerk session may still be valid
37+
// (bridge remounts, provider tree changes, missing cloud config), so local
38+
// Live Activities and the persisted registration record must survive.
39+
exportfunctionsuspendCloudRelayAccount(): void{
40+
suspendAgentAwarenessRelayTokenProvider();
41+
setManagedRelaySession(appAtomRegistry,null);
42+
}
43+
3544
exportfunctionactivateCloudRelayAccount(
3645
accountId: string,
3746
tokenProvider: ()=>Promise<string|null>,
@@ -143,7 +152,7 @@ function CloudAuthBridge(props: { readonly children: ReactNode }) {
143152
useEffect(
144153
()=>()=>{
145154
previousTokenProviderRef.current=null;
146-
deactivateCloudRelayAccount();
155+
suspendCloudRelayAccount();
147156
},
148157
[],
149158
);
@@ -158,7 +167,7 @@ export function CloudAuthProvider(props: { readonly children: ReactNode }) {
158167

159168
useEffect(()=>{
160169
if(!publishableKey||!relayUrl){
161-
deactivateCloudRelayAccount();
170+
suspendCloudRelayAccount();
162171
}
163172
},[publishableKey,relayUrl]);
164173

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit fa19061

Browse files
committed
Fix registration status stuck pending and destructive teardown on unmount
- Reset a registration status left as 'pending' back to 'unknown' when the device registration effect exits without reaching the relay (signed out, missing relay config, or superseded by a newer generation). - Add a non-destructive suspend path for relay token provider teardown so CloudAuthBridge unmount and missing cloud config no longer end local Live Activities or clear the persisted registration record while the user is still signed in.
1 parent 5225bdb commit fa19061

2 files changed

Lines changed: 41 additions & 12 deletions

File tree

‎apps/mobile/src/features/agent-awareness/remoteRegistration.ts‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,30 @@ export function shouldRegisterAgentAwarenessDeviceForProvider(
143143
returnidentity===undefined||identity!==previousIdentity;
144144
}
145145

146+
functionremoveRelaySubscriptions(): void{
147+
pushToStartSubscription?.remove();
148+
pushToStartSubscription=null;
149+
pushTokenSubscription?.remove();
150+
pushTokenSubscription=null;
151+
appStateSubscription?.remove();
152+
appStateSubscription=null;
153+
if(activeLiveActivityRegistrationRetry){
154+
clearTimeout(activeLiveActivityRegistrationRetry);
155+
activeLiveActivityRegistrationRetry=null;
156+
}
157+
}
158+
159+
// Drops the relay token provider without sign-out semantics: the Clerk session
160+
// can still be valid while the auth bridge tears down (remounts, provider tree
161+
// changes, missing cloud config). Listeners stop, but local Live Activities,
162+
// the persisted registration record, and the provider identity stay intact so
163+
// re-activating the same account does not end activities or force
164+
// re-registration.
165+
exportfunctionsuspendAgentAwarenessRelayTokenProvider(): void{
166+
relayTokenProvider=null;
167+
removeRelaySubscriptions();
168+
}
169+
146170
exportfunctionsetAgentAwarenessRelayTokenProvider(
147171
provider: (()=>Promise<string|null>)|null,
148172
identity?: string,
@@ -158,16 +182,7 @@ export function setAgentAwarenessRelayTokenProvider(
158182
relayTokenProvider=provider;
159183
relayTokenProviderIdentity=provider ? (identity??null) : null;
160184
if(!provider){
161-
pushToStartSubscription?.remove();
162-
pushToStartSubscription=null;
163-
pushTokenSubscription?.remove();
164-
pushTokenSubscription=null;
165-
appStateSubscription?.remove();
166-
appStateSubscription=null;
167-
if(activeLiveActivityRegistrationRetry){
168-
clearTimeout(activeLiveActivityRegistrationRetry);
169-
activeLiveActivityRegistrationRetry=null;
170-
}
185+
removeRelaySubscriptions();
171186
// Without a signed-in user the relay can no longer update or end these
172187
// activities, so they would sit orphaned on the lock screen.
173188
endLocalLiveActivities("live activity cleanup after cloud sign-out failed");
@@ -472,6 +487,11 @@ function startPendingDeviceRegistration(): void {
472487
if(result._tag==="Failure"&&!isAtomCommandInterrupted(result)){
473488
setRegistrationStatus("failed");
474489
logRegistrationError(next.context,squashAtomCommandFailure(result));
490+
}elseif(registrationStatus==="pending"){
491+
// The registration exited without reaching the relay (signed out,
492+
// missing relay config, or superseded by a newer generation); don't
493+
// leave the status stuck on pending.
494+
setRegistrationStatus("unknown");
475495
}
476496
logRegistrationDebug("device registration finished",{ generation });
477497
if(activeDeviceRegistration===registration){

‎apps/mobile/src/features/cloud/CloudAuthProvider.tsx‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { appAtomRegistry } from "../../state/atom-registry";
1515
import{useAtomCommand}from"../../state/use-atom-command";
1616
import{
1717
setAgentAwarenessRelayTokenProvider,
18+
suspendAgentAwarenessRelayTokenProvider,
1819
unregisterAgentAwarenessDeviceForCurrentUser,
1920
}from"../agent-awareness/remoteRegistration";
2021
import{resolveCloudPublicConfig,resolveRelayClerkTokenOptions}from"./publicConfig";
@@ -32,6 +33,14 @@ export function deactivateCloudRelayAccount(): void {
3233
setManagedRelaySession(appAtomRegistry,null);
3334
}
3435

36+
// Teardown without sign-out semantics: the Clerk session may still be valid
37+
// (bridge remounts, provider tree changes, missing cloud config), so local
38+
// Live Activities and the persisted registration record must survive.
39+
exportfunctionsuspendCloudRelayAccount(): void{
40+
suspendAgentAwarenessRelayTokenProvider();
41+
setManagedRelaySession(appAtomRegistry,null);
42+
}
43+
3544
exportfunctionactivateCloudRelayAccount(
3645
accountId: string,
3746
tokenProvider: ()=>Promise<string|null>,
@@ -143,7 +152,7 @@ function CloudAuthBridge(props: { readonly children: ReactNode }) {
143152
useEffect(
144153
()=>()=>{
145154
previousTokenProviderRef.current=null;
146-
deactivateCloudRelayAccount();
155+
suspendCloudRelayAccount();
147156
},
148157
[],
149158
);
@@ -158,7 +167,7 @@ export function CloudAuthProvider(props: { readonly children: ReactNode }) {
158167

159168
useEffect(()=>{
160169
if(!publishableKey||!relayUrl){
161-
deactivateCloudRelayAccount();
170+
suspendCloudRelayAccount();
162171
}
163172
},[publishableKey,relayUrl]);
164173

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit fa19061

Browse files
committed
Fix registration status stuck pending and destructive teardown on unmount
- Reset a registration status left as 'pending' back to 'unknown' when the device registration effect exits without reaching the relay (signed out, missing relay config, or superseded by a newer generation). - Add a non-destructive suspend path for relay token provider teardown so CloudAuthBridge unmount and missing cloud config no longer end local Live Activities or clear the persisted registration record while the user is still signed in.
1 parent 5225bdb commit fa19061

2 files changed

Lines changed: 41 additions & 12 deletions

File tree

‎apps/mobile/src/features/agent-awareness/remoteRegistration.ts‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,30 @@ export function shouldRegisterAgentAwarenessDeviceForProvider(
143143
returnidentity===undefined||identity!==previousIdentity;
144144
}
145145

146+
functionremoveRelaySubscriptions(): void{
147+
pushToStartSubscription?.remove();
148+
pushToStartSubscription=null;
149+
pushTokenSubscription?.remove();
150+
pushTokenSubscription=null;
151+
appStateSubscription?.remove();
152+
appStateSubscription=null;
153+
if(activeLiveActivityRegistrationRetry){
154+
clearTimeout(activeLiveActivityRegistrationRetry);
155+
activeLiveActivityRegistrationRetry=null;
156+
}
157+
}
158+
159+
// Drops the relay token provider without sign-out semantics: the Clerk session
160+
// can still be valid while the auth bridge tears down (remounts, provider tree
161+
// changes, missing cloud config). Listeners stop, but local Live Activities,
162+
// the persisted registration record, and the provider identity stay intact so
163+
// re-activating the same account does not end activities or force
164+
// re-registration.
165+
exportfunctionsuspendAgentAwarenessRelayTokenProvider(): void{
166+
relayTokenProvider=null;
167+
removeRelaySubscriptions();
168+
}
169+
146170
exportfunctionsetAgentAwarenessRelayTokenProvider(
147171
provider: (()=>Promise<string|null>)|null,
148172
identity?: string,
@@ -158,16 +182,7 @@ export function setAgentAwarenessRelayTokenProvider(
158182
relayTokenProvider=provider;
159183
relayTokenProviderIdentity=provider ? (identity??null) : null;
160184
if(!provider){
161-
pushToStartSubscription?.remove();
162-
pushToStartSubscription=null;
163-
pushTokenSubscription?.remove();
164-
pushTokenSubscription=null;
165-
appStateSubscription?.remove();
166-
appStateSubscription=null;
167-
if(activeLiveActivityRegistrationRetry){
168-
clearTimeout(activeLiveActivityRegistrationRetry);
169-
activeLiveActivityRegistrationRetry=null;
170-
}
185+
removeRelaySubscriptions();
171186
// Without a signed-in user the relay can no longer update or end these
172187
// activities, so they would sit orphaned on the lock screen.
173188
endLocalLiveActivities("live activity cleanup after cloud sign-out failed");
@@ -472,6 +487,11 @@ function startPendingDeviceRegistration(): void {
472487
if(result._tag==="Failure"&&!isAtomCommandInterrupted(result)){
473488
setRegistrationStatus("failed");
474489
logRegistrationError(next.context,squashAtomCommandFailure(result));
490+
}elseif(registrationStatus==="pending"){
491+
// The registration exited without reaching the relay (signed out,
492+
// missing relay config, or superseded by a newer generation); don't
493+
// leave the status stuck on pending.
494+
setRegistrationStatus("unknown");
475495
}
476496
logRegistrationDebug("device registration finished",{ generation });
477497
if(activeDeviceRegistration===registration){

‎apps/mobile/src/features/cloud/CloudAuthProvider.tsx‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { appAtomRegistry } from "../../state/atom-registry";
1515
import{useAtomCommand}from"../../state/use-atom-command";
1616
import{
1717
setAgentAwarenessRelayTokenProvider,
18+
suspendAgentAwarenessRelayTokenProvider,
1819
unregisterAgentAwarenessDeviceForCurrentUser,
1920
}from"../agent-awareness/remoteRegistration";
2021
import{resolveCloudPublicConfig,resolveRelayClerkTokenOptions}from"./publicConfig";
@@ -32,6 +33,14 @@ export function deactivateCloudRelayAccount(): void {
3233
setManagedRelaySession(appAtomRegistry,null);
3334
}
3435

36+
// Teardown without sign-out semantics: the Clerk session may still be valid
37+
// (bridge remounts, provider tree changes, missing cloud config), so local
38+
// Live Activities and the persisted registration record must survive.
39+
exportfunctionsuspendCloudRelayAccount(): void{
40+
suspendAgentAwarenessRelayTokenProvider();
41+
setManagedRelaySession(appAtomRegistry,null);
42+
}
43+
3544
exportfunctionactivateCloudRelayAccount(
3645
accountId: string,
3746
tokenProvider: ()=>Promise<string|null>,
@@ -143,7 +152,7 @@ function CloudAuthBridge(props: { readonly children: ReactNode }) {
143152
useEffect(
144153
()=>()=>{
145154
previousTokenProviderRef.current=null;
146-
deactivateCloudRelayAccount();
155+
suspendCloudRelayAccount();
147156
},
148157
[],
149158
);
@@ -158,7 +167,7 @@ export function CloudAuthProvider(props: { readonly children: ReactNode }) {
158167

159168
useEffect(()=>{
160169
if(!publishableKey||!relayUrl){
161-
deactivateCloudRelayAccount();
170+
suspendCloudRelayAccount();
162171
}
163172
},[publishableKey,relayUrl]);
164173

0 commit comments

Comments
 (0)