mirror of
https://github.com/Memo-2023/mana-monorepo.git
synced 2026-05-17 16:09:40 +02:00
feat(mana-sync): unified WebSocket — one connection per user instead of 27
Add unified /ws endpoint that serves all app notifications over a single connection.
The server now includes appId in the sync-available message payload so the client
knows which app to pull. Legacy /ws/{appId} endpoint remains for backward compatibility.
Backend (Go):
- hub.go: Message struct gains AppId field, NotifyUser sends to all user clients
(unified clients receive everything, legacy clients filtered by appId)
- main.go: new GET /ws route (empty appId = unified mode)
Frontend (sync.ts):
- Single connectUnifiedWs() replaces 27 per-app connectWs() calls
- Parses msg.appId from server to pull only the affected app
- Reconnect/offline logic simplified to one WS
This reduces WebSocket connections from 27 per user to 1, cutting server
connection overhead by ~96%.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
df7395e57a
commit
ee831992de
4 changed files with 64 additions and 39 deletions
|
|
@ -40,7 +40,6 @@ interface SyncMeta {
|
|||
interface SyncChannelState {
|
||||
appId: string;
|
||||
tables: string[];
|
||||
ws: WebSocket | null;
|
||||
pushTimer: ReturnType<typeof setTimeout> | null;
|
||||
pullTimer: ReturnType<typeof setInterval> | null;
|
||||
lastError: string | null;
|
||||
|
|
@ -53,8 +52,6 @@ export type SyncStatus = 'idle' | 'syncing' | 'error' | 'offline';
|
|||
const PUSH_DEBOUNCE = 1000;
|
||||
const PULL_INTERVAL = 30_000;
|
||||
const WS_RECONNECT_DELAY = 5000;
|
||||
const WS_AUTH_TIMEOUT = 10_000;
|
||||
|
||||
// ─── Unified Sync Manager ─────────────────────────────────────
|
||||
|
||||
export function createUnifiedSync(serverUrl: string, getToken: () => Promise<string | null>) {
|
||||
|
|
@ -63,6 +60,7 @@ export function createUnifiedSync(serverUrl: string, getToken: () => Promise<str
|
|||
let status: SyncStatus = 'idle';
|
||||
let online = typeof navigator !== 'undefined' ? navigator.onLine : true;
|
||||
let _statusListeners: Array<(s: SyncStatus) => void> = [];
|
||||
let unifiedWs: WebSocket | null = null;
|
||||
|
||||
// ─── Lifecycle ──────────────────────────────────────────
|
||||
|
||||
|
|
@ -71,7 +69,6 @@ export function createUnifiedSync(serverUrl: string, getToken: () => Promise<str
|
|||
const channel: SyncChannelState = {
|
||||
appId,
|
||||
tables,
|
||||
ws: null,
|
||||
pushTimer: null,
|
||||
pullTimer: null,
|
||||
lastError: null,
|
||||
|
|
@ -81,11 +78,11 @@ export function createUnifiedSync(serverUrl: string, getToken: () => Promise<str
|
|||
// Initial pull, then start periodic sync
|
||||
pull(appId).catch(() => {});
|
||||
channel.pullTimer = setInterval(() => pull(appId).catch(() => {}), PULL_INTERVAL);
|
||||
|
||||
// Connect WebSocket for real-time push notifications
|
||||
connectWs(appId);
|
||||
}
|
||||
|
||||
// Single unified WebSocket for all apps
|
||||
connectUnifiedWs();
|
||||
|
||||
// Listen for online/offline
|
||||
if (typeof window !== 'undefined') {
|
||||
window.addEventListener('online', handleOnline);
|
||||
|
|
@ -97,14 +94,15 @@ export function createUnifiedSync(serverUrl: string, getToken: () => Promise<str
|
|||
for (const [, channel] of channels) {
|
||||
if (channel.pushTimer) clearTimeout(channel.pushTimer);
|
||||
if (channel.pullTimer) clearInterval(channel.pullTimer);
|
||||
if (channel.ws) {
|
||||
channel.ws.close();
|
||||
channel.ws = null;
|
||||
}
|
||||
}
|
||||
channels.clear();
|
||||
_statusListeners = [];
|
||||
|
||||
if (unifiedWs) {
|
||||
unifiedWs.close();
|
||||
unifiedWs = null;
|
||||
}
|
||||
|
||||
if (typeof window !== 'undefined') {
|
||||
window.removeEventListener('online', handleOnline);
|
||||
window.removeEventListener('offline', handleOffline);
|
||||
|
|
@ -237,19 +235,18 @@ export function createUnifiedSync(serverUrl: string, getToken: () => Promise<str
|
|||
}
|
||||
}
|
||||
|
||||
// ─── WebSocket ──────────────────────────────────────────
|
||||
// ─── WebSocket (unified — one connection for all apps) ──
|
||||
|
||||
function connectWs(appId: string): void {
|
||||
const channel = channels.get(appId);
|
||||
if (!channel || !online) return;
|
||||
function connectUnifiedWs(): void {
|
||||
if (!online) return;
|
||||
|
||||
const wsUrl = serverUrl.replace(/^http/, 'ws') + `/ws/${appId}`;
|
||||
const wsUrl = serverUrl.replace(/^http/, 'ws') + '/ws';
|
||||
|
||||
try {
|
||||
const ws = new WebSocket(wsUrl);
|
||||
|
||||
ws.onopen = async () => {
|
||||
channel.ws = ws;
|
||||
unifiedWs = ws;
|
||||
// Authenticate — backend requires auth within 10 seconds
|
||||
const token = await getToken();
|
||||
if (token && ws.readyState === WebSocket.OPEN) {
|
||||
|
|
@ -260,9 +257,9 @@ export function createUnifiedSync(serverUrl: string, getToken: () => Promise<str
|
|||
ws.onmessage = (event) => {
|
||||
try {
|
||||
const msg = JSON.parse(event.data);
|
||||
if (msg.type === 'sync-available') {
|
||||
// Server notifies us of new changes — trigger pull
|
||||
pull(appId).catch(() => {});
|
||||
if (msg.type === 'sync-available' && msg.appId) {
|
||||
// Server notifies us of changes for a specific app — pull only that app
|
||||
pull(msg.appId).catch(() => {});
|
||||
}
|
||||
} catch {
|
||||
// Ignore malformed messages
|
||||
|
|
@ -270,10 +267,10 @@ export function createUnifiedSync(serverUrl: string, getToken: () => Promise<str
|
|||
};
|
||||
|
||||
ws.onclose = () => {
|
||||
channel.ws = null;
|
||||
unifiedWs = null;
|
||||
// Reconnect after delay
|
||||
if (channels.has(appId) && online) {
|
||||
setTimeout(() => connectWs(appId), WS_RECONNECT_DELAY);
|
||||
if (channels.size > 0 && online) {
|
||||
setTimeout(() => connectUnifiedWs(), WS_RECONNECT_DELAY);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -427,19 +424,20 @@ export function createUnifiedSync(serverUrl: string, getToken: () => Promise<str
|
|||
// Resume sync for all channels
|
||||
for (const appId of channels.keys()) {
|
||||
pull(appId).catch(() => {});
|
||||
connectWs(appId);
|
||||
}
|
||||
// Reconnect unified WebSocket
|
||||
if (!unifiedWs) {
|
||||
connectUnifiedWs();
|
||||
}
|
||||
}
|
||||
|
||||
function handleOffline() {
|
||||
online = false;
|
||||
setStatus('offline');
|
||||
// Close all WebSockets
|
||||
for (const channel of channels.values()) {
|
||||
if (channel.ws) {
|
||||
channel.ws.close();
|
||||
channel.ws = null;
|
||||
}
|
||||
// Close unified WebSocket
|
||||
if (unifiedWs) {
|
||||
unifiedWs.close();
|
||||
unifiedWs = null;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue