refactor: remove unused subscribe/unsubscribe transport synchronization

Author: RomainLanz

src/transmit.ts

@@ -23,22 +23,11 @@ export interface TransmitLifecycleHooks<Context> {
   unsubscribe: { uid: string; channel: string; context: Context }
 }
 
-type TransmitMessage =
-  | {
-      type: typeof TransportMessageType.Broadcast
-      channel: string
-      payload: Broadcastable
-    }
-  | {
-      type: typeof TransportMessageType.Subscribe
-      channel: string
-      payload: { uid: string }
-    }
-  | {
-      type: typeof TransportMessageType.Unsubscribe
-      channel: string
-      payload: { uid: string }
-    }
+type TransmitMessage = {
+  type: typeof TransportMessageType.Broadcast
+  channel: string
+  payload: Broadcastable
+}
 
 export class Transmit<Context extends unknown> {
   /**
@@ -82,15 +71,7 @@ export class Transmit<Context extends unknown> {
 
     // Subscribe to the transport channel and handle incoming messages
     void this.#bus?.subscribe<TransmitMessage>(this.#transportChannel, (message) => {
-      const { type, channel, payload } = message
-
-      if (type === TransportMessageType.Broadcast) {
-        void this.#broadcastLocally(channel, payload)
-      } else if (type === TransportMessageType.Subscribe) {
-        void this.#subscribeLocally({ uid: payload.uid, channel })
-      } else if (type === TransportMessageType.Unsubscribe) {
-        void this.#unsubscribeLocally({ uid: payload.uid, channel })
-      }
+      void this.#broadcastLocally(message.channel, message.payload)
     })
 
     // Start the ping interval if configured
@@ -133,13 +114,6 @@ export class Transmit<Context extends unknown> {
     this.#manager.authorize(channel, callback)
   }
 
-  #subscribeLocally(params: Omit<SubscribeParams<Context>, 'onSubscribe'>) {
-    return this.#manager.subscribe({
-      ...params,
-      skipAuthorization: true,
-    })
-  }
-
   subscribe(params: Omit<SubscribeParams<Context>, 'onSubscribe'>) {
     return this.#manager.subscribe({
       ...params,
@@ -149,22 +123,10 @@ export class Transmit<Context extends unknown> {
           channel,
           context,
         })
-
-        void this.#bus?.publish(this.#transportChannel, {
-          type: TransportMessageType.Subscribe,
-          channel,
-          payload: { uid },
-        })
       },
     })
   }
 
-  #unsubscribeLocally(params: Omit<UnsubscribeParams<Context>, 'onUnsubscribe'>) {
-    return this.#manager.unsubscribe({
-      ...params,
-    })
-  }
-
   unsubscribe(params: Omit<UnsubscribeParams<Context>, 'onUnsubscribe'>) {
     return this.#manager.unsubscribe({
       ...params,
@@ -174,12 +136,6 @@ export class Transmit<Context extends unknown> {
           channel,
           context,
         })
-
-        void this.#bus?.publish(this.#transportChannel, {
-          type: TransportMessageType.Unsubscribe,
-          channel,
-          payload: { uid },
-        })
       },
     })
   }

src/transport_message_type.ts

@@ -7,6 +7,4 @@
 
 export const TransportMessageType = {
   Broadcast: 1,
-  Subscribe: 2,
-  Unsubscribe: 3,
 } as const

tests/transmit.spec.ts

@@ -315,44 +315,6 @@ test.group('Transmit', () => {
     assert.lengthOf(transport.transport.receivedMessages, 0)
   })
 
-  test('should broadcast to the bus when a client subscribe to a channel', async ({ assert }) => {
-    const transport = makeTransport()
-    const transmit = makeTransmitWithTransport(transport)
-    makeTransmitWithTransport(transport)
-
-    const stream = makeStream(transmit)
-
-    await transmit.subscribe({
-      uid: stream.getUid(),
-      channel: 'channel1',
-    })
-
-    assert.lengthOf(transport.transport.receivedMessages, 1)
-    assert.equal(transport.transport.receivedMessages[0].type, TransportMessageType.Subscribe)
-  })
-
-  test('should broadcast to the bus when a client unsubscribe a channel', async ({ assert }) => {
-    const transport = makeTransport()
-    const transmit = makeTransmitWithTransport(transport)
-
-    makeTransmitWithTransport(transport)
-
-    const stream = makeStream(transmit)
-
-    await transmit.subscribe({
-      uid: stream.getUid(),
-      channel: 'channel1',
-    })
-
-    await transmit.unsubscribe({
-      uid: stream.getUid(),
-      channel: 'channel1',
-    })
-
-    assert.lengthOf(transport.transport.receivedMessages, 2)
-    assert.equal(transport.transport.receivedMessages[1].type, TransportMessageType.Unsubscribe)
-  })
-
   test('should broadcast to the bus when sending a message', async ({ assert }) => {
     const transport = makeTransport()
     const transmit = makeTransmitWithTransport(transport)
@@ -367,8 +329,8 @@ test.group('Transmit', () => {
 
     transmit.broadcast('channel1', { message: 'hello' })
 
-    assert.lengthOf(transport.transport.receivedMessages, 2)
-    assert.equal(transport.transport.receivedMessages[1].type, TransportMessageType.Broadcast)
+    assert.lengthOf(transport.transport.receivedMessages, 1)
+    assert.equal(transport.transport.receivedMessages[0].type, TransportMessageType.Broadcast)
   })
 
   test('second instance should receive the broadcasted message', async ({ assert }) => {