devsyncwrld/backspace
1
0
Fork 0
Code Issues Pull Requests Actions 26 Packages Projects Releases Wiki Activity

fix: federation self-connection causing sidebar space duplication

Browse Source 
Guard autoConnectAll against connecting to window.location.origin,
send perspective-correct replicatedInstances lists so remotes never
store self-references, and deduplicate unaccounted spaces in sidebar.
This commit is contained in:
Jannis Braun
2026-03-12 16:29:11 +01:00
parent 7a7e0784d8
commit 06b56472f9
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/web/src/components/layout/SpaceSidebar.tsx
+1
View File
@@ -899,6 +899,7 @@ export function SpaceSidebar() {
for (const space of spaces) {
if (!accountedSpaceIds.has(space.id)) {
result.push({ type: 'space', space });
accountedSpaceIds.add(space.id);
}
}
packages/web/src/stores/instanceStore.ts
+25 -10
View File
@@ -478,25 +478,38 @@ export const useInstanceStore = create<InstanceState>((set, get) => ({
const currentUser = useAuthStore.getState().user;
if (!currentUser) return;
// Build the replicated instances list from all connected remotes
const replicatedInstances: ReplicatedInstance[] = instances.map(inst => ({
// Build perspective-correct replicated instance lists.
// Each instance should store references to OTHER instances, never itself.
const homeOrigin = window.location.origin;
const homeUsername = currentUser.username.includes('@')
? currentUser.username.split('@')[0]!
: currentUser.username;
// Home list: all remotes (home never references itself)
const homeList: ReplicatedInstance[] = instances.map(inst => ({
origin: inst.origin,
username: inst.username,
}));
// Push to home instance
const homePromise = api.users.update({ replicatedInstances }).catch((err) => {
const homePromise = api.users.update({ replicatedInstances: homeList }).catch((err) => {
console.warn('Failed to sync instance list to home:', err);
});
// Push to each remote instance
const remotePromises = instances
.filter(inst => inst.status === 'connected')
.map(inst =>
inst.api.users.update({ replicatedInstances }).catch((err) => {
// Push perspective-correct list to each remote instance:
// include home + all OTHER remotes, but exclude the remote's own origin
const connectedInstances = instances.filter(inst => inst.status === 'connected');
const remotePromises = connectedInstances.map(inst => {
const listForRemote: ReplicatedInstance[] = [
{ origin: homeOrigin, username: homeUsername },
...instances
.filter(other => other.origin !== inst.origin)
.map(other => ({ origin: other.origin, username: other.username })),
];
return inst.api.users.update({ replicatedInstances: listForRemote }).catch((err) => {
console.warn(`Failed to sync instance list to ${inst.origin}:`, err);
})
);
});
});
await Promise.all([homePromise, ...remotePromises]);
},
@@ -518,6 +531,8 @@ export const useInstanceStore = create<InstanceState>((set, get) => ({
for (const ri of currentUser.replicatedInstances) {
const origin = ri.origin || `https://${ri.domain}`;
// Never connect to ourselves — home WS is managed separately
if (origin === window.location.origin) continue;
if (get().instances.some(i => i.origin === origin)) continue; // already loaded
const entry = cached[origin];
if (entry) {