feat: destroy room when deleted (TexteaInc#8)

exuanbo · Sep 2, 2022 · ac11e25 · ac11e25
1 parent fb849d5
commit ac11e25
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/example/src/App.tsx b/example/src/App.tsx
@@ -58,7 +58,7 @@ export const App: React.FC = () => {
  awareness.on('update', handleAwarenessUpdate)
  const provider = createSocketIOProvider('ws:https://localhost:1234', 'test', yDoc, {
  awareness,
- autoConnectBroadcastChannel: true
+ autoConnect: false
  })
  setProvider(provider)
  return () => {

diff --git a/src/hooks.ts b/src/hooks.ts
@@ -8,16 +8,16 @@ const getInitialState = () => INITIAL_STATE
 const noop = () => noop
 const identity = <T>(value: T) => value
 
-export function useSocketIOProviderState (provider: SocketIOProvider | undefined): SocketIOProviderState
+export function useSocketIOProviderState (provider: SocketIOProvider | null | undefined): SocketIOProviderState
 
 export function useSocketIOProviderState<StateSlice> (
- provider: SocketIOProvider | undefined,
+ provider: SocketIOProvider | null | undefined,
  selector: (state: SocketIOProviderState) => StateSlice,
  equalityFn?: (a: StateSlice, b: StateSlice) => boolean
 ): StateSlice
 
 export function useSocketIOProviderState<StateSlice> (
- provider: SocketIOProvider | undefined,
+ provider: SocketIOProvider | null | undefined,
  selector: (state: SocketIOProviderState) => StateSlice | SocketIOProviderState = identity,
  equalityFn?: (a: StateSlice | SocketIOProviderState, b: StateSlice | SocketIOProviderState) => boolean
 ) {

diff --git a/src/provider.ts b/src/provider.ts
@@ -15,11 +15,11 @@ import type {
 export interface Options {
  awareness?: Awareness
  /**
- * @default false
+ * @default true
  */
  autoConnect?: boolean
  /**
- * @default false
+ * @default true
  */
  autoConnectBroadcastChannel?: boolean
 }
@@ -67,8 +67,8 @@ export const createSocketIOProvider: CreateSocketIOProvider = (
  doc,
  {
  awareness = new Awareness(doc),
- autoConnect = false,
- autoConnectBroadcastChannel = false
+ autoConnect = true,
+ autoConnectBroadcastChannel = true
  } = {}
 ) => {
  const store = createStore<SocketIOProviderState>()(

diff --git a/src/server/socket/index.ts b/src/server/socket/index.ts
@@ -91,5 +91,14 @@ export const createSocketServer = (httpServer: HTTPServer) => {
  })
  })
 
+ io.sockets.adapter.on('delete-room', (roomName: string) => {
+ if (roomMap.has(roomName)) {
+ const room = roomMap.get(roomName)!
+ room.doc.destroy()
+ room.awareness.destroy()
+ roomMap.delete(roomName)
+ }
+ })
+
  return io
 }