Skip to content

fix/better persistent leader unloading #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 17, 2025
Merged

fix/better persistent leader unloading #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions src/y-socket-io/y-socket-io.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,6 @@ export class YSocketIO {
if (nsp?.sockets.size === 0 && stream) {
this.cleanupNamespace(ns, stream, DEFAULT_CLEAR_TIMEOUT)
if (this.namespaceDocMap.has(ns)) this.debouncedPersist(ns, true)
this.persistentLeaderOf.delete(ns)
}
logSocketIO(`disconnecting socket in ${ns}, ${nsp?.sockets.size || 0} remaining`)
}
Expand Down Expand Up @@ -475,7 +474,8 @@ export class YSocketIO {
const nsp = this.namespaceMap.get(namespace)
if (!nsp) return
if (nsp.sockets.size === 0 && this.subscriber) {
this.cleanupNamespace(namespace, stream, DEFAULT_CLEAR_TIMEOUT)
const isLeader = this.persistentLeaderOf.has(namespace)
this.cleanupNamespace(namespace, stream, DEFAULT_CLEAR_TIMEOUT, isLeader)
}

/** @type {Uint8Array[]} */
Expand Down Expand Up @@ -708,13 +708,19 @@ export class YSocketIO {
* @param {string} namespace
* @param {string} stream
* @param {number=} removeAfterWait
* @param {boolean=} extendExisting
*/
cleanupNamespace (namespace, stream, removeAfterWait) {
cleanupNamespace (namespace, stream, removeAfterWait, extendExisting = false) {
if (!removeAfterWait) {
this.awaitingCleanupNamespace.delete(namespace)
return this.cleanupNamespaceImpl(namespace, stream)
}
if (this.awaitingCleanupNamespace.has(namespace)) return

const existingTimer = this.awaitingCleanupNamespace.get(namespace)
if (existingTimer) {
if (!extendExisting) return
clearTimeout(existingTimer)
}

const timer = setTimeout(async () => {
const awaitingPersist = this.awaitingPersistMap.get(namespace)
Expand All @@ -739,6 +745,15 @@ export class YSocketIO {
this.namespaceDocMap.get(namespace)?.ydoc.destroy()
this.namespaceDocMap.delete(namespace)
this.namespacePersistentMap.delete(namespace)
this.persistentLeaderOf.delete(namespace)

// clear leader key in redis when we fully clean up
if (this.client) {
const key = this.getLeaderKeyOf(namespace)
this.client.redis
.del(key)
.catch((e) => console.error(e))
}
}

async waitUntilWorkerReady () {
Expand Down Expand Up @@ -818,8 +833,11 @@ export class YSocketIO {
const curLeader = await redis.get(key)

// remove orphaned if exist
const aliveClients = this.namespaceMap.get(namespace)?.sockets.size || 0
if (aliveClients === 0) {
const nsp = this.namespaceMap.get(namespace)
const hasDoc = this.namespaceDocMap.has(namespace)
const hasCleanupTimer = this.awaitingCleanupNamespace.has(namespace)
const isActiveHere = Boolean(nsp || hasDoc || hasCleanupTimer)
if (!isActiveHere) {
logSocketIO(`clearing leader heartbeat for [${namespace}] (SID: ${this.serverId})`)
this.persistentLeaderOf.delete(namespace)
continue
Expand Down