@jcbuisson/express-x-plugins 4.0.12 → 4.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcbuisson/express-x-plugins",
-  "version": "4.0.12",
+  "version": "4.0.13",
   "description": "Plugins for express-x",
   "type": "module",
   "main": "./src/electric-server-plugin.mjs",

package/src/reload-server-plugin.mjs

@@ -74,7 +74,7 @@ export async function reloadPlugin(app, options = {}) {
             // copy rooms
             for (const room of fromSocketRooms) {
                if (room === fromSocketId) continue // do not include room associated to socket#id
-               toSocket.join(room)
+               await toSocket.join(room)
             }
             // copy data
             toSocket.data = {

package/test/reload-server-plugin.test.mjs

@@ -12,11 +12,15 @@ class FakeSocket {
       this.emitted = []
       this.sockets = sockets
       this.disconnectingListener = disconnectingListener
+      this.joinDelay = Promise.resolve()
    }
 
    on(event, handler) { this.handlers.set(event, handler) }
    emit(event, ...args) { this.emitted.push([event, ...args]) }
-   join(room) { this.rooms.add(room) }
+   async join(room) {
+      await this.joinDelay
+      this.rooms.add(room)
+   }
    disconnect() {
       this.disconnectingListener(this, 'server namespace disconnect')
       this.sockets.delete(this.id)
@@ -46,9 +50,16 @@ test('transfers state when the replacement connects before the old socket discon
    const transferToken = oldSocket.emitted.find(([event]) => event === 'cnx-transfer-token')[1]
 
    const newSocket = new FakeSocket('new', sockets, (...args) => disconnectingListener(...args))
+   let finishJoin
+   newSocket.joinDelay = new Promise(resolve => { finishJoin = resolve })
    sockets.set(newSocket.id, newSocket)
    connectListener(newSocket)
-   await newSocket.handlers.get('cnx-transfer')('old', 'new', transferToken)
+   const transfer = newSocket.handlers.get('cnx-transfer')('old', 'new', transferToken)
+
+   await Promise.resolve()
+   assert.equal(newSocket.emitted.some(([event]) => event === 'cnx-transfer-ack'), false)
+   finishJoin()
+   await transfer
 
    assert.equal(newSocket.data.user, 'Ada')
    assert.equal(newSocket.rooms.has('project:1'), true)