@edge-base/react-native 0.2.0 → 0.2.2

package/dist/index.d.cts

@@ -1,4 +1,5 @@
-import { HttpClient, GeneratedDbApi, IDatabaseLiveSubscriber, ContextManager, StorageClient, FunctionsClient, DbRef, ContextValue } from '@edge-base/core';
+import { HttpClient, GeneratedDbApi, IDatabaseLiveSubscriber, ContextManager, Subscription, StorageClient, FunctionsClient, DbRef, ContextValue } from '@edge-base/core';
+export { Subscription } from '@edge-base/core';
 import React from 'react';
 
 /**
@@ -405,8 +406,8 @@ declare class DatabaseLiveClient implements IDatabaseLiveSubscriber {
     private unsubAuthState;
     private options;
     constructor(baseUrl: string, tokenManager: TokenManager, options?: DatabaseLiveOptions, contextManager?: ContextManager);
-    onSnapshot<T>(channel: string, callback: (change: DbChange<T>) => void, clientFilters?: unknown, serverFilters?: unknown, serverOrFilters?: unknown): () => void;
-    onError(handler: ErrorHandler$1): () => void;
+    onSnapshot<T>(channel: string, callback: (change: DbChange<T>) => void, clientFilters?: unknown, serverFilters?: unknown, serverOrFilters?: unknown): Subscription;
+    onError(handler: ErrorHandler$1): Subscription;
     connect(channel: string): Promise<void>;
     reconnect(): void;
     disconnect(): void;
@@ -547,9 +548,7 @@ interface RoomOptions {
     /** Timeout for WebSocket connection establishment in ms (default: 15000) */
     connectionTimeout?: number;
 }
-interface Subscription {
-    unsubscribe(): void;
-}
+
 type SharedStateHandler = (state: Record<string, unknown>, changes: Record<string, unknown>) => void;
 type PlayerStateHandler = (state: Record<string, unknown>, changes: Record<string, unknown>) => void;
 type MessageHandler = (data: unknown) => void;
@@ -841,14 +840,14 @@ declare class RoomClient {
      * Subscribe to shared state changes.
      * Called on full sync and on each shared_delta.
      *
-     * @returns Subscription with unsubscribe()
+     * @returns Subscription (callable & .unsubscribe())
      */
     onSharedState(handler: SharedStateHandler): Subscription;
     /**
      * Subscribe to player state changes.
      * Called on full sync and on each player_delta.
      *
-     * @returns Subscription with unsubscribe()
+     * @returns Subscription (callable & .unsubscribe())
      */
     onPlayerState(handler: PlayerStateHandler): Subscription;
     /**
@@ -857,13 +856,13 @@ declare class RoomClient {
      * @example
      * room.onMessage('game_over', (data) => { console.log(data.winner); });
      *
-     * @returns Subscription with unsubscribe()
+     * @returns Subscription (callable & .unsubscribe())
      */
     onMessage(messageType: string, handler: MessageHandler): Subscription;
     /**
      * Subscribe to ALL messages regardless of type.
      *
-     * @returns Subscription with unsubscribe()
+     * @returns Subscription (callable & .unsubscribe())
      */
     onAnyMessage(handler: (messageType: string, data: unknown) => void): Subscription;
     /** Subscribe to errors */
@@ -1411,4 +1410,4 @@ declare function useTurnstile({ baseUrl, action, }: UseTurnstileOptions): UseTur
  */
 declare function isPlatformWeb(): boolean;
 
-export { type AppStateAdapter, type AsyncStorageAdapter, AuthClient, type AuthResult, type AuthStateChangeHandler, ClientAnalytics, ClientEdgeBase, DatabaseLiveClient, type DatabaseLiveClientAdapter, type DatabaseLiveOptions, type FilterEntry, type FilterOperator, type JuneClientOptions, LifecycleManager, type LinkingAdapter, type PasskeysAuthOptions, PushClient, type PushMessage, type PushMessageHandler, type PushPermissionProvider, type PushPermissionStatus, type PushPlatform, type PushTokenProvider, RoomClient, type RoomCloudflareRealtimeKitCreateSessionRequest, type RoomCloudflareRealtimeKitCreateSessionResponse, type RoomCloudflareRealtimeKitTransportFactoryOptions, type RoomConnectionState, type RoomMediaDeviceChange, type RoomMediaKind, type RoomMediaMember, type RoomMediaRemoteTrackEvent, type RoomMediaTrack, type RoomMediaTransport, type RoomMediaTransportConnectPayload, type RoomMediaTransportOptions, type RoomMediaTransportProvider, type RoomMember, type RoomMemberLeaveReason, type RoomMemberMediaKindState, type RoomMemberMediaState, type RoomOptions, type RoomP2PTransportFactoryOptions, type RoomReconnectInfo, type RoomSignalMeta, type Session, type SignInOptions, type SignUpOptions, type Subscription, TokenManager, type TokenPair, type TokenUser, TurnstileWebView, type TurnstileWebViewProps, type UpdateProfileOptions, type UseLifecycleOptions, type UseTurnstileOptions, type UseTurnstileResult, createClient, isPlatformWeb, matchesFilter, useLifecycle, useTurnstile };
+export { type AppStateAdapter, type AsyncStorageAdapter, AuthClient, type AuthResult, type AuthStateChangeHandler, ClientAnalytics, ClientEdgeBase, DatabaseLiveClient, type DatabaseLiveClientAdapter, type DatabaseLiveOptions, type FilterEntry, type FilterOperator, type JuneClientOptions, LifecycleManager, type LinkingAdapter, type PasskeysAuthOptions, PushClient, type PushMessage, type PushMessageHandler, type PushPermissionProvider, type PushPermissionStatus, type PushPlatform, type PushTokenProvider, RoomClient, type RoomCloudflareRealtimeKitCreateSessionRequest, type RoomCloudflareRealtimeKitCreateSessionResponse, type RoomCloudflareRealtimeKitTransportFactoryOptions, type RoomConnectionState, type RoomMediaDeviceChange, type RoomMediaKind, type RoomMediaMember, type RoomMediaRemoteTrackEvent, type RoomMediaTrack, type RoomMediaTransport, type RoomMediaTransportConnectPayload, type RoomMediaTransportOptions, type RoomMediaTransportProvider, type RoomMember, type RoomMemberLeaveReason, type RoomMemberMediaKindState, type RoomMemberMediaState, type RoomOptions, type RoomP2PTransportFactoryOptions, type RoomReconnectInfo, type RoomSignalMeta, type Session, type SignInOptions, type SignUpOptions, TokenManager, type TokenPair, type TokenUser, TurnstileWebView, type TurnstileWebViewProps, type UpdateProfileOptions, type UseLifecycleOptions, type UseTurnstileOptions, type UseTurnstileResult, createClient, isPlatformWeb, matchesFilter, useLifecycle, useTurnstile };

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-import { HttpClient, GeneratedDbApi, IDatabaseLiveSubscriber, ContextManager, StorageClient, FunctionsClient, DbRef, ContextValue } from '@edge-base/core';
+import { HttpClient, GeneratedDbApi, IDatabaseLiveSubscriber, ContextManager, Subscription, StorageClient, FunctionsClient, DbRef, ContextValue } from '@edge-base/core';
+export { Subscription } from '@edge-base/core';
 import React from 'react';
 
 /**
@@ -405,8 +406,8 @@ declare class DatabaseLiveClient implements IDatabaseLiveSubscriber {
     private unsubAuthState;
     private options;
     constructor(baseUrl: string, tokenManager: TokenManager, options?: DatabaseLiveOptions, contextManager?: ContextManager);
-    onSnapshot<T>(channel: string, callback: (change: DbChange<T>) => void, clientFilters?: unknown, serverFilters?: unknown, serverOrFilters?: unknown): () => void;
-    onError(handler: ErrorHandler$1): () => void;
+    onSnapshot<T>(channel: string, callback: (change: DbChange<T>) => void, clientFilters?: unknown, serverFilters?: unknown, serverOrFilters?: unknown): Subscription;
+    onError(handler: ErrorHandler$1): Subscription;
     connect(channel: string): Promise<void>;
     reconnect(): void;
     disconnect(): void;
@@ -547,9 +548,7 @@ interface RoomOptions {
     /** Timeout for WebSocket connection establishment in ms (default: 15000) */
     connectionTimeout?: number;
 }
-interface Subscription {
-    unsubscribe(): void;
-}
+
 type SharedStateHandler = (state: Record<string, unknown>, changes: Record<string, unknown>) => void;
 type PlayerStateHandler = (state: Record<string, unknown>, changes: Record<string, unknown>) => void;
 type MessageHandler = (data: unknown) => void;
@@ -841,14 +840,14 @@ declare class RoomClient {
      * Subscribe to shared state changes.
      * Called on full sync and on each shared_delta.
      *
-     * @returns Subscription with unsubscribe()
+     * @returns Subscription (callable & .unsubscribe())
      */
     onSharedState(handler: SharedStateHandler): Subscription;
     /**
      * Subscribe to player state changes.
      * Called on full sync and on each player_delta.
      *
-     * @returns Subscription with unsubscribe()
+     * @returns Subscription (callable & .unsubscribe())
      */
     onPlayerState(handler: PlayerStateHandler): Subscription;
     /**
@@ -857,13 +856,13 @@ declare class RoomClient {
      * @example
      * room.onMessage('game_over', (data) => { console.log(data.winner); });
      *
-     * @returns Subscription with unsubscribe()
+     * @returns Subscription (callable & .unsubscribe())
      */
     onMessage(messageType: string, handler: MessageHandler): Subscription;
     /**
      * Subscribe to ALL messages regardless of type.
      *
-     * @returns Subscription with unsubscribe()
+     * @returns Subscription (callable & .unsubscribe())
      */
     onAnyMessage(handler: (messageType: string, data: unknown) => void): Subscription;
     /** Subscribe to errors */
@@ -1411,4 +1410,4 @@ declare function useTurnstile({ baseUrl, action, }: UseTurnstileOptions): UseTur
  */
 declare function isPlatformWeb(): boolean;
 
-export { type AppStateAdapter, type AsyncStorageAdapter, AuthClient, type AuthResult, type AuthStateChangeHandler, ClientAnalytics, ClientEdgeBase, DatabaseLiveClient, type DatabaseLiveClientAdapter, type DatabaseLiveOptions, type FilterEntry, type FilterOperator, type JuneClientOptions, LifecycleManager, type LinkingAdapter, type PasskeysAuthOptions, PushClient, type PushMessage, type PushMessageHandler, type PushPermissionProvider, type PushPermissionStatus, type PushPlatform, type PushTokenProvider, RoomClient, type RoomCloudflareRealtimeKitCreateSessionRequest, type RoomCloudflareRealtimeKitCreateSessionResponse, type RoomCloudflareRealtimeKitTransportFactoryOptions, type RoomConnectionState, type RoomMediaDeviceChange, type RoomMediaKind, type RoomMediaMember, type RoomMediaRemoteTrackEvent, type RoomMediaTrack, type RoomMediaTransport, type RoomMediaTransportConnectPayload, type RoomMediaTransportOptions, type RoomMediaTransportProvider, type RoomMember, type RoomMemberLeaveReason, type RoomMemberMediaKindState, type RoomMemberMediaState, type RoomOptions, type RoomP2PTransportFactoryOptions, type RoomReconnectInfo, type RoomSignalMeta, type Session, type SignInOptions, type SignUpOptions, type Subscription, TokenManager, type TokenPair, type TokenUser, TurnstileWebView, type TurnstileWebViewProps, type UpdateProfileOptions, type UseLifecycleOptions, type UseTurnstileOptions, type UseTurnstileResult, createClient, isPlatformWeb, matchesFilter, useLifecycle, useTurnstile };
+export { type AppStateAdapter, type AsyncStorageAdapter, AuthClient, type AuthResult, type AuthStateChangeHandler, ClientAnalytics, ClientEdgeBase, DatabaseLiveClient, type DatabaseLiveClientAdapter, type DatabaseLiveOptions, type FilterEntry, type FilterOperator, type JuneClientOptions, LifecycleManager, type LinkingAdapter, type PasskeysAuthOptions, PushClient, type PushMessage, type PushMessageHandler, type PushPermissionProvider, type PushPermissionStatus, type PushPlatform, type PushTokenProvider, RoomClient, type RoomCloudflareRealtimeKitCreateSessionRequest, type RoomCloudflareRealtimeKitCreateSessionResponse, type RoomCloudflareRealtimeKitTransportFactoryOptions, type RoomConnectionState, type RoomMediaDeviceChange, type RoomMediaKind, type RoomMediaMember, type RoomMediaRemoteTrackEvent, type RoomMediaTrack, type RoomMediaTransport, type RoomMediaTransportConnectPayload, type RoomMediaTransportOptions, type RoomMediaTransportProvider, type RoomMember, type RoomMemberLeaveReason, type RoomMemberMediaKindState, type RoomMemberMediaState, type RoomOptions, type RoomP2PTransportFactoryOptions, type RoomReconnectInfo, type RoomSignalMeta, type Session, type SignInOptions, type SignUpOptions, TokenManager, type TokenPair, type TokenUser, TurnstileWebView, type TurnstileWebViewProps, type UpdateProfileOptions, type UseLifecycleOptions, type UseTurnstileOptions, type UseTurnstileResult, createClient, isPlatformWeb, matchesFilter, useLifecycle, useTurnstile };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { EdgeBaseError, ApiPaths, ContextManager, HttpClient, DefaultDbApi, HttpClientAdapter, PublicHttpClientAdapter, StorageClient, FunctionsClient, DbRef } from '@edge-base/core';
+import { EdgeBaseError, createSubscription, ApiPaths, ContextManager, HttpClient, DefaultDbApi, HttpClientAdapter, PublicHttpClientAdapter, StorageClient, FunctionsClient, DbRef } from '@edge-base/core';
 import React, { useCallback, useState, useEffect } from 'react';
 
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
@@ -646,7 +646,7 @@ var DatabaseLiveClient = class {
     }
     this.connect(channel).catch(() => {
     });
-    return () => {
+    return createSubscription(() => {
       const subs = this.subscriptions.get(channel);
       if (!subs) return;
       const idx = subs.indexOf(sub);
@@ -657,14 +657,14 @@ var DatabaseLiveClient = class {
         this.channelOrFilters.delete(channel);
         this.sendUnsubscribe(channel);
       }
-    };
+    });
   }
   onError(handler) {
     this.errorHandlers.push(handler);
-    return () => {
+    return createSubscription(() => {
       const idx = this.errorHandlers.indexOf(handler);
       if (idx >= 0) this.errorHandlers.splice(idx, 1);
-    };
+    });
   }
   async connect(channel) {
     this.connectedChannels.add(channel);
@@ -752,7 +752,7 @@ var DatabaseLiveClient = class {
       (refreshToken) => refreshAccessToken(this.baseUrl, refreshToken)
     );
     if (!token) throw new EdgeBaseError(401, "No access token available. Sign in first.");
-    this.sendRaw({ type: "auth", token, sdkVersion: "0.2.0" });
+    this.sendRaw({ type: "auth", token, sdkVersion: "0.2.2" });
     return new Promise((resolve, reject) => {
       const timeout = setTimeout(() => reject(new EdgeBaseError(401, "Auth timeout")), 1e4);
       const original = this.ws?.onmessage;
@@ -872,7 +872,7 @@ var DatabaseLiveClient = class {
   refreshAuth() {
     const token = this.tokenManager.currentAccessToken;
     if (!token || !this.ws || !this.connected) return;
-    this.sendRaw({ type: "auth", token, sdkVersion: "0.2.0" });
+    this.sendRaw({ type: "auth", token, sdkVersion: "0.2.2" });
   }
   handleAuthStateChange(user) {
     if (user) {
@@ -1219,14 +1219,12 @@ var RoomCloudflareMediaTransport = class {
   }
   onRemoteTrack(handler) {
     this.remoteTrackHandlers.push(handler);
-    return {
-      unsubscribe: () => {
-        const index = this.remoteTrackHandlers.indexOf(handler);
-        if (index >= 0) {
-          this.remoteTrackHandlers.splice(index, 1);
-        }
+    return createSubscription(() => {
+      const index = this.remoteTrackHandlers.indexOf(handler);
+      if (index >= 0) {
+        this.remoteTrackHandlers.splice(index, 1);
       }
-    };
+    });
   }
   destroy() {
     this.lifecycleVersion += 1;
@@ -1627,14 +1625,12 @@ var RoomP2PMediaTransport = class {
   }
   onRemoteTrack(handler) {
     this.remoteTrackHandlers.push(handler);
-    return {
-      unsubscribe: () => {
-        const index = this.remoteTrackHandlers.indexOf(handler);
-        if (index >= 0) {
-          this.remoteTrackHandlers.splice(index, 1);
-        }
+    return createSubscription(() => {
+      const index = this.remoteTrackHandlers.indexOf(handler);
+      if (index >= 0) {
+        this.remoteTrackHandlers.splice(index, 1);
       }
-    };
+    });
   }
   destroy() {
     this.connected = false;
@@ -2501,31 +2497,27 @@ var RoomClient = class _RoomClient {
    * Subscribe to shared state changes.
    * Called on full sync and on each shared_delta.
    *
-   * @returns Subscription with unsubscribe()
+   * @returns Subscription (callable & .unsubscribe())
    */
   onSharedState(handler) {
     this.sharedStateHandlers.push(handler);
-    return {
-      unsubscribe: () => {
-        const idx = this.sharedStateHandlers.indexOf(handler);
-        if (idx >= 0) this.sharedStateHandlers.splice(idx, 1);
-      }
-    };
+    return createSubscription(() => {
+      const idx = this.sharedStateHandlers.indexOf(handler);
+      if (idx >= 0) this.sharedStateHandlers.splice(idx, 1);
+    });
   }
   /**
    * Subscribe to player state changes.
    * Called on full sync and on each player_delta.
    *
-   * @returns Subscription with unsubscribe()
+   * @returns Subscription (callable & .unsubscribe())
    */
   onPlayerState(handler) {
     this.playerStateHandlers.push(handler);
-    return {
-      unsubscribe: () => {
-        const idx = this.playerStateHandlers.indexOf(handler);
-        if (idx >= 0) this.playerStateHandlers.splice(idx, 1);
-      }
-    };
+    return createSubscription(() => {
+      const idx = this.playerStateHandlers.indexOf(handler);
+      if (idx >= 0) this.playerStateHandlers.splice(idx, 1);
+    });
   }
   /**
    * Subscribe to messages of a specific type sent by room.sendMessage().
@@ -2533,169 +2525,137 @@ var RoomClient = class _RoomClient {
    * @example
    * room.onMessage('game_over', (data) => { console.log(data.winner); });
    *
-   * @returns Subscription with unsubscribe()
+   * @returns Subscription (callable & .unsubscribe())
    */
   onMessage(messageType, handler) {
     if (!this.messageHandlers.has(messageType)) {
       this.messageHandlers.set(messageType, []);
     }
     this.messageHandlers.get(messageType).push(handler);
-    return {
-      unsubscribe: () => {
-        const handlers = this.messageHandlers.get(messageType);
-        if (handlers) {
-          const idx = handlers.indexOf(handler);
-          if (idx >= 0) handlers.splice(idx, 1);
-        }
+    return createSubscription(() => {
+      const handlers = this.messageHandlers.get(messageType);
+      if (handlers) {
+        const idx = handlers.indexOf(handler);
+        if (idx >= 0) handlers.splice(idx, 1);
       }
-    };
+    });
   }
   /**
    * Subscribe to ALL messages regardless of type.
    *
-   * @returns Subscription with unsubscribe()
+   * @returns Subscription (callable & .unsubscribe())
    */
   onAnyMessage(handler) {
     this.allMessageHandlers.push(handler);
-    return {
-      unsubscribe: () => {
-        const idx = this.allMessageHandlers.indexOf(handler);
-        if (idx >= 0) this.allMessageHandlers.splice(idx, 1);
-      }
-    };
+    return createSubscription(() => {
+      const idx = this.allMessageHandlers.indexOf(handler);
+      if (idx >= 0) this.allMessageHandlers.splice(idx, 1);
+    });
   }
   /** Subscribe to errors */
   onError(handler) {
     this.errorHandlers.push(handler);
-    return {
-      unsubscribe: () => {
-        const idx = this.errorHandlers.indexOf(handler);
-        if (idx >= 0) this.errorHandlers.splice(idx, 1);
-      }
-    };
+    return createSubscription(() => {
+      const idx = this.errorHandlers.indexOf(handler);
+      if (idx >= 0) this.errorHandlers.splice(idx, 1);
+    });
   }
   /** Subscribe to kick events */
   onKicked(handler) {
     this.kickedHandlers.push(handler);
-    return {
-      unsubscribe: () => {
-        const idx = this.kickedHandlers.indexOf(handler);
-        if (idx >= 0) this.kickedHandlers.splice(idx, 1);
-      }
-    };
+    return createSubscription(() => {
+      const idx = this.kickedHandlers.indexOf(handler);
+      if (idx >= 0) this.kickedHandlers.splice(idx, 1);
+    });
   }
   onSignal(event, handler) {
     if (!this.signalHandlers.has(event)) {
       this.signalHandlers.set(event, []);
     }
     this.signalHandlers.get(event).push(handler);
-    return {
-      unsubscribe: () => {
-        const handlers = this.signalHandlers.get(event);
-        if (!handlers) return;
-        const index = handlers.indexOf(handler);
-        if (index >= 0) handlers.splice(index, 1);
-      }
-    };
+    return createSubscription(() => {
+      const handlers = this.signalHandlers.get(event);
+      if (!handlers) return;
+      const index = handlers.indexOf(handler);
+      if (index >= 0) handlers.splice(index, 1);
+    });
   }
   onAnySignal(handler) {
     this.anySignalHandlers.push(handler);
-    return {
-      unsubscribe: () => {
-        const index = this.anySignalHandlers.indexOf(handler);
-        if (index >= 0) this.anySignalHandlers.splice(index, 1);
-      }
-    };
+    return createSubscription(() => {
+      const index = this.anySignalHandlers.indexOf(handler);
+      if (index >= 0) this.anySignalHandlers.splice(index, 1);
+    });
   }
   onMembersSync(handler) {
     this.memberSyncHandlers.push(handler);
-    return {
-      unsubscribe: () => {
-        const index = this.memberSyncHandlers.indexOf(handler);
-        if (index >= 0) this.memberSyncHandlers.splice(index, 1);
-      }
-    };
+    return createSubscription(() => {
+      const index = this.memberSyncHandlers.indexOf(handler);
+      if (index >= 0) this.memberSyncHandlers.splice(index, 1);
+    });
   }
   onMemberJoin(handler) {
     this.memberJoinHandlers.push(handler);
-    return {
-      unsubscribe: () => {
-        const index = this.memberJoinHandlers.indexOf(handler);
-        if (index >= 0) this.memberJoinHandlers.splice(index, 1);
-      }
-    };
+    return createSubscription(() => {
+      const index = this.memberJoinHandlers.indexOf(handler);
+      if (index >= 0) this.memberJoinHandlers.splice(index, 1);
+    });
   }
   onMemberLeave(handler) {
     this.memberLeaveHandlers.push(handler);
-    return {
-      unsubscribe: () => {
-        const index = this.memberLeaveHandlers.indexOf(handler);
-        if (index >= 0) this.memberLeaveHandlers.splice(index, 1);
-      }
-    };
+    return createSubscription(() => {
+      const index = this.memberLeaveHandlers.indexOf(handler);
+      if (index >= 0) this.memberLeaveHandlers.splice(index, 1);
+    });
   }
   onMemberStateChange(handler) {
     this.memberStateHandlers.push(handler);
-    return {
-      unsubscribe: () => {
-        const index = this.memberStateHandlers.indexOf(handler);
-        if (index >= 0) this.memberStateHandlers.splice(index, 1);
-      }
-    };
+    return createSubscription(() => {
+      const index = this.memberStateHandlers.indexOf(handler);
+      if (index >= 0) this.memberStateHandlers.splice(index, 1);
+    });
   }
   onReconnect(handler) {
     this.reconnectHandlers.push(handler);
-    return {
-      unsubscribe: () => {
-        const index = this.reconnectHandlers.indexOf(handler);
-        if (index >= 0) this.reconnectHandlers.splice(index, 1);
-      }
-    };
+    return createSubscription(() => {
+      const index = this.reconnectHandlers.indexOf(handler);
+      if (index >= 0) this.reconnectHandlers.splice(index, 1);
+    });
   }
   onConnectionStateChange(handler) {
     this.connectionStateHandlers.push(handler);
-    return {
-      unsubscribe: () => {
-        const index = this.connectionStateHandlers.indexOf(handler);
-        if (index >= 0) this.connectionStateHandlers.splice(index, 1);
-      }
-    };
+    return createSubscription(() => {
+      const index = this.connectionStateHandlers.indexOf(handler);
+      if (index >= 0) this.connectionStateHandlers.splice(index, 1);
+    });
   }
   onMediaTrack(handler) {
     this.mediaTrackHandlers.push(handler);
-    return {
-      unsubscribe: () => {
-        const index = this.mediaTrackHandlers.indexOf(handler);
-        if (index >= 0) this.mediaTrackHandlers.splice(index, 1);
-      }
-    };
+    return createSubscription(() => {
+      const index = this.mediaTrackHandlers.indexOf(handler);
+      if (index >= 0) this.mediaTrackHandlers.splice(index, 1);
+    });
   }
   onMediaTrackRemoved(handler) {
     this.mediaTrackRemovedHandlers.push(handler);
-    return {
-      unsubscribe: () => {
-        const index = this.mediaTrackRemovedHandlers.indexOf(handler);
-        if (index >= 0) this.mediaTrackRemovedHandlers.splice(index, 1);
-      }
-    };
+    return createSubscription(() => {
+      const index = this.mediaTrackRemovedHandlers.indexOf(handler);
+      if (index >= 0) this.mediaTrackRemovedHandlers.splice(index, 1);
+    });
   }
   onMediaStateChange(handler) {
     this.mediaStateHandlers.push(handler);
-    return {
-      unsubscribe: () => {
-        const index = this.mediaStateHandlers.indexOf(handler);
-        if (index >= 0) this.mediaStateHandlers.splice(index, 1);
-      }
-    };
+    return createSubscription(() => {
+      const index = this.mediaStateHandlers.indexOf(handler);
+      if (index >= 0) this.mediaStateHandlers.splice(index, 1);
+    });
   }
   onMediaDeviceChange(handler) {
     this.mediaDeviceHandlers.push(handler);
-    return {
-      unsubscribe: () => {
-        const index = this.mediaDeviceHandlers.indexOf(handler);
-        if (index >= 0) this.mediaDeviceHandlers.splice(index, 1);
-      }
-    };
+    return createSubscription(() => {
+      const index = this.mediaDeviceHandlers.indexOf(handler);
+      if (index >= 0) this.mediaDeviceHandlers.splice(index, 1);
+    });
   }
   async sendSignal(event, payload, options) {
     if (!this.ws || !this.connected || !this.authenticated) {