@crowdedkingdomstudios/crowdyjs 1.0.7 → 2.1.0

package/dist/index.d.ts

@@ -1,8 +1,38 @@
 /**
- * CrowdyJS SDK - Client SDK for Crowded Kingdoms GraphQL API
+ * CrowdyJS SDK - Client SDK for Crowded Kingdoms GraphQL API.
+ *
+ * Usage:
+ *
+ *   import { CrowdyClient } from '@crowdedkingdomstudios/crowdyjs';
+ *
+ *   const client = new CrowdyClient({ graphqlEndpoint, wsEndpoint });
+ *   const { token } = await client.auth.login({ email, password });
+ *   const me = await client.users.me();
+ *   const myOrgs = await client.orgs.myOrganizations();
+ *   const checkout = await client.payments.createCheckout({ ... });
+ *   const unsub = client.udp.subscribe({ onActorUpdate: (n) => { ... } });
  */
 declare const VERSION: string;
 export { VERSION };
-export { CrowdyClient } from './crowdy-client.js';
-export type { CrowdyClientConfig, BigInt, ChunkCoordinates, ChunkCoordinatesInput, VoxelCoordinates, VoxelCoordinatesInput, UdpErrorCode, User, AuthResponse, UdpProxyConnectionStatus, ActorUpdateRequestInput, VoxelUpdateRequestInput, ClientAudioPacketInput, ClientTextPacketInput, ClientEventNotificationInput, ActorUpdateNotification, ActorUpdateResponse, VoxelUpdateNotification, VoxelUpdateResponse, ClientAudioNotification, ClientTextNotification, ClientEventNotification, ServerEventNotification, GenericErrorResponse, UdpNotification, ActorUpdateHandler, ActorUpdateResponseHandler, VoxelUpdateHandler, VoxelUpdateResponseHandler, ClientAudioHandler, ClientTextHandler, ClientEventHandler, ServerEventHandler, GenericErrorHandler, UnsubscribeFn, } from './types.js';
+export { CrowdyClient, type CrowdyClientConfig } from './crowdy-client.js';
+export type { BigInt, ChunkCoordinates, VoxelCoordinates, ActorUpdateNotification, ActorUpdateResponse, VoxelUpdateNotification, VoxelUpdateResponse, ClientAudioNotification, ClientTextNotification, ClientEventNotification, ServerEventNotification, GenericErrorResponse, UdpNotification, ActorUpdateHandler, ActorUpdateResponseHandler, VoxelUpdateHandler, VoxelUpdateResponseHandler, ClientAudioHandler, ClientTextHandler, ClientEventHandler, ServerEventHandler, GenericErrorHandler, UnsubscribeFn, } from './types.js';
+export { UdpErrorCode } from './types.js';
+export type { UdpNotificationHandlers } from './subscriptions.js';
+export { AuthAPI } from './domains/auth.js';
+export { UsersAPI } from './domains/users.js';
+export { OrganizationsAPI } from './domains/organizations.js';
+export { AppsAPI } from './domains/apps.js';
+export { AppAccessAPI } from './domains/appAccess.js';
+export { BillingAPI } from './domains/billing.js';
+export { QuotasAPI } from './domains/quotas.js';
+export { PaymentsAPI } from './domains/payments.js';
+export { ChunksAPI } from './domains/chunks.js';
+export { VoxelsAPI } from './domains/voxels.js';
+export { ActorsAPI } from './domains/actors.js';
+export { TeleportAPI } from './domains/teleport.js';
+export { StateAPI } from './domains/state.js';
+export { ServerStatusAPI } from './domains/serverStatus.js';
+export { UdpAPI } from './domains/udp.js';
+export type { ChunkCoordinatesInput, VoxelCoordinatesInput, ActorUpdateRequestInput, VoxelUpdateRequestInput, ClientAudioPacketInput, ClientTextPacketInput, ClientEventNotificationInput, UdpProxyConnectionStatus, LoginUserInput, RegisterUserInput, ResetPasswordInput, CreateOrganizationInput, CreateOrgTokenInput, UpdateOrgTokenInput, CreateOrgRoleInput, UpdateOrgRoleInput, InviteOrgMemberInput, CreateAppInput, UpdateAppInput, AppMarketplaceFilterInput, CreateAccessTierInput, UpdateAccessTierInput, GrantAppAccessInput, CreateCheckoutInput, CheckoutFilterInput, SetQuotaInput, CreateActorInput, UpdateActorInput, ActorFilterInput, BatchActorLookupInput, CreateUserAppStateInput, UpdateUserStateInput, UpdateAvatarStateInput, UpdateActorStateInput, UpdateGamertagInput, UpdateChunkStateInput, UpdateChunkLodsInput, ChunkUpdateInput, UpdateVoxelInput, RollbackVoxelUpdatesInput, GetChunkInput, GetChunkLodsInput, GetChunksByDistanceInput, GetVoxelListInput, ListVoxelsInput, ListVoxelUpdatesByDistanceInput, TeleportRequestInput, LodDataInput, VoxelStateInput, Organization, OrgMember, OrgRole, OrgToken, OrgPermission, OrgMembership, App, AppsPage, AppAccessTier, AppUserAccess, AppBudget, OrgWallet, WalletTransaction, Checkout, CheckoutsPage, ServiceQuota, Chunk, ChunkLodsResponse, ChunksByDistanceResponse, ChunkVoxelResponse, ChunkVoxelUpdatesResponse, Voxel, VoxelUpdatesByDistanceResponse, VoxelUpdateHistoryEvent, RollbackVoxelEventResult, Actor, Avatar, AvatarDto, TeleportResponse, UserAppState, ServerStatus, GraphQlServer, ServerVersionInfo, VersionInfo, PageInfo, UsersPage, Scalars, } from './generated/graphql.js';
+export { PaymentProvider, CheckoutPurpose, CheckoutStatus, AppVisibility, AppStatus, ServerState, } from './generated/graphql.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,QAAA,MAAiB,OAAO,QAAsD,CAAC;AAE/E,OAAO,EAAE,OAAO,EAAE,CAAC;AAGnB,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,YAAY,EAEV,kBAAkB,EAElB,MAAM,EACN,gBAAgB,EAChB,qBAAqB,EACrB,gBAAgB,EAChB,qBAAqB,EACrB,YAAY,EACZ,IAAI,EACJ,YAAY,EACZ,wBAAwB,EAExB,uBAAuB,EACvB,uBAAuB,EACvB,sBAAsB,EACtB,qBAAqB,EACrB,4BAA4B,EAE5B,uBAAuB,EACvB,mBAAmB,EACnB,uBAAuB,EACvB,mBAAmB,EACnB,uBAAuB,EACvB,sBAAsB,EACtB,uBAAuB,EACvB,uBAAuB,EACvB,oBAAoB,EACpB,eAAe,EAEf,kBAAkB,EAClB,0BAA0B,EAC1B,kBAAkB,EAClB,0BAA0B,EAC1B,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,GACd,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -1,5 +1,16 @@
 /**
- * CrowdyJS SDK - Client SDK for Crowded Kingdoms GraphQL API
+ * CrowdyJS SDK - Client SDK for Crowded Kingdoms GraphQL API.
+ *
+ * Usage:
+ *
+ *   import { CrowdyClient } from '@crowdedkingdomstudios/crowdyjs';
+ *
+ *   const client = new CrowdyClient({ graphqlEndpoint, wsEndpoint });
+ *   const { token } = await client.auth.login({ email, password });
+ *   const me = await client.users.me();
+ *   const myOrgs = await client.orgs.myOrganizations();
+ *   const checkout = await client.payments.createCheckout({ ... });
+ *   const unsub = client.udp.subscribe({ onActorUpdate: (n) => { ... } });
  */
 import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
@@ -7,3 +18,25 @@ const { version: VERSION } = require('../package.json');
 export { VERSION };
 console.log(`CrowdyJS v${VERSION}`);
 export { CrowdyClient } from './crowdy-client.js';
+export { UdpErrorCode } from './types.js';
+// -----------------------------------------------------------------------------
+// Domain wrappers (exported so consumers can reference the API surface in
+// their own type annotations).
+// -----------------------------------------------------------------------------
+export { AuthAPI } from './domains/auth.js';
+export { UsersAPI } from './domains/users.js';
+export { OrganizationsAPI } from './domains/organizations.js';
+export { AppsAPI } from './domains/apps.js';
+export { AppAccessAPI } from './domains/appAccess.js';
+export { BillingAPI } from './domains/billing.js';
+export { QuotasAPI } from './domains/quotas.js';
+export { PaymentsAPI } from './domains/payments.js';
+export { ChunksAPI } from './domains/chunks.js';
+export { VoxelsAPI } from './domains/voxels.js';
+export { ActorsAPI } from './domains/actors.js';
+export { TeleportAPI } from './domains/teleport.js';
+export { StateAPI } from './domains/state.js';
+export { ServerStatusAPI } from './domains/serverStatus.js';
+export { UdpAPI } from './domains/udp.js';
+// Re-export schema enums as values (so consumers can switch on them).
+export { PaymentProvider, CheckoutPurpose, CheckoutStatus, AppVisibility, AppStatus, ServerState, } from './generated/graphql.js';

package/dist/subscriptions.d.ts

@@ -1,30 +1,48 @@
 /**
- * WebSocket subscription manager with type-specific handlers
+ * WebSocket subscription manager for the udpNotifications stream.
+ *
+ * Owns one shared `graphql-transport-ws` socket and dispatches incoming
+ * `udpNotifications` payloads to per-typename handler arrays. Reads its
+ * bearer token from `AuthState` so HTTP and WS auth can never drift.
+ *
+ * Public API is now `subscribe(handlers)` which returns an unsubscribe
+ * function; the per-handler `onActorUpdate` etc. shims are gone.
  */
+import { AuthState } from './auth-state.js';
 import type { ActorUpdateHandler, ActorUpdateResponseHandler, VoxelUpdateHandler, VoxelUpdateResponseHandler, ClientAudioHandler, ClientTextHandler, ClientEventHandler, ServerEventHandler, GenericErrorHandler, UnsubscribeFn } from './types.js';
+export interface UdpNotificationHandlers {
+    onActorUpdate?: ActorUpdateHandler;
+    onActorUpdateResponse?: ActorUpdateResponseHandler;
+    onVoxelUpdate?: VoxelUpdateHandler;
+    onVoxelUpdateResponse?: VoxelUpdateResponseHandler;
+    onClientAudio?: ClientAudioHandler;
+    onClientText?: ClientTextHandler;
+    onClientEvent?: ClientEventHandler;
+    onServerEvent?: ServerEventHandler;
+    onGenericError?: GenericErrorHandler;
+}
+export interface SubscriptionManagerConfig {
+    wsEndpoint?: string;
+}
 export declare class SubscriptionManager {
-    private handlers;
+    private readonly wsEndpoint;
+    private readonly authState;
     private wsClient;
     private wsUnsubscribe;
     private subscriptionId;
-    private wsEndpoint;
-    private token;
-    constructor(config?: {
-        wsEndpoint?: string;
-    });
-    setAuthToken(token: string | null): void;
+    private subscribers;
+    private nextSubscriberId;
+    constructor(config: SubscriptionManagerConfig | undefined, authState: AuthState);
+    /**
+     * Register handlers for the udpNotifications stream. The first call opens
+     * the shared socket (provided we have a token); subsequent calls reuse it.
+     * The returned function detaches just this set of handlers and closes the
+     * socket once the last subscriber leaves.
+     */
+    subscribe(handlers: UdpNotificationHandlers): UnsubscribeFn;
     private ensureSubscription;
     private startSubscription;
-    private handleNotification;
-    onActorUpdate(handler: ActorUpdateHandler): UnsubscribeFn;
-    onActorUpdateResponse(handler: ActorUpdateResponseHandler): UnsubscribeFn;
-    onVoxelUpdate(handler: VoxelUpdateHandler): UnsubscribeFn;
-    onVoxelUpdateResponse(handler: VoxelUpdateResponseHandler): UnsubscribeFn;
-    onClientAudio(handler: ClientAudioHandler): UnsubscribeFn;
-    onClientText(handler: ClientTextHandler): UnsubscribeFn;
-    onClientEvent(handler: ClientEventHandler): UnsubscribeFn;
-    onServerEvent(handler: ServerEventHandler): UnsubscribeFn;
-    onGenericError(handler: GenericErrorHandler): UnsubscribeFn;
+    private dispatch;
     private checkIfShouldUnsubscribe;
     close(): void;
 }

package/dist/subscriptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subscriptions.d.ts","sourceRoot":"","sources":["../src/subscriptions.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAEV,kBAAkB,EAClB,0BAA0B,EAC1B,kBAAkB,EAClB,0BAA0B,EAC1B,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACd,MAAM,YAAY,CAAC;AAcpB,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAUd;IAEF,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,KAAK,CAAuB;gBAExB,MAAM,GAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAA;KAAO;IAIhD,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAIxC,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,iBAAiB;IAyHzB,OAAO,CAAC,kBAAkB;IAmB1B,aAAa,CAAC,OAAO,EAAE,kBAAkB,GAAG,aAAa;IAYzD,qBAAqB,CAAC,OAAO,EAAE,0BAA0B,GAAG,aAAa;IAYzE,aAAa,CAAC,OAAO,EAAE,kBAAkB,GAAG,aAAa;IAYzD,qBAAqB,CAAC,OAAO,EAAE,0BAA0B,GAAG,aAAa;IAYzE,aAAa,CAAC,OAAO,EAAE,kBAAkB,GAAG,aAAa;IAYzD,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,aAAa;IAYvD,aAAa,CAAC,OAAO,EAAE,kBAAkB,GAAG,aAAa;IAYzD,aAAa,CAAC,OAAO,EAAE,kBAAkB,GAAG,aAAa;IAYzD,cAAc,CAAC,OAAO,EAAE,mBAAmB,GAAG,aAAa;IAY3D,OAAO,CAAC,wBAAwB;IAShC,KAAK,IAAI,IAAI;CAWd"}
+{"version":3,"file":"subscriptions.d.ts","sourceRoot":"","sources":["../src/subscriptions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,EAEV,kBAAkB,EAClB,0BAA0B,EAC1B,kBAAkB,EAClB,0BAA0B,EAC1B,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACd,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,uBAAuB;IACtC,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC,qBAAqB,CAAC,EAAE,0BAA0B,CAAC;IACnD,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC,qBAAqB,CAAC,EAAE,0BAA0B,CAAC;IACnD,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC,cAAc,CAAC,EAAE,mBAAmB,CAAC;CACtC;AAOD,MAAM,WAAW,yBAAyB;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,WAAW,CAA6C;IAChE,OAAO,CAAC,gBAAgB,CAAK;gBAEjB,MAAM,EAAE,yBAAyB,YAAK,EAAE,SAAS,EAAE,SAAS;IAKxE;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,EAAE,uBAAuB,GAAG,aAAa;IAU3D,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,iBAAiB;IAsFzB,OAAO,CAAC,QAAQ;IA6ChB,OAAO,CAAC,wBAAwB;IAOhC,KAAK,IAAI,IAAI;CAMd"}

package/dist/subscriptions.js

@@ -1,27 +1,37 @@
 /**
- * WebSocket subscription manager with type-specific handlers
+ * WebSocket subscription manager for the udpNotifications stream.
+ *
+ * Owns one shared `graphql-transport-ws` socket and dispatches incoming
+ * `udpNotifications` payloads to per-typename handler arrays. Reads its
+ * bearer token from `AuthState` so HTTP and WS auth can never drift.
+ *
+ * Public API is now `subscribe(handlers)` which returns an unsubscribe
+ * function; the per-handler `onActorUpdate` etc. shims are gone.
  */
 export class SubscriptionManager {
-    constructor(config = {}) {
-        this.handlers = {
-            ActorUpdateNotification: [],
-            ActorUpdateResponse: [],
-            VoxelUpdateNotification: [],
-            VoxelUpdateResponse: [],
-            ClientAudioNotification: [],
-            ClientTextNotification: [],
-            ClientEventNotification: [],
-            ServerEventNotification: [],
-            GenericErrorResponse: [],
-        };
+    constructor(config = {}, authState) {
         this.wsClient = null;
         this.wsUnsubscribe = null;
         this.subscriptionId = null;
-        this.token = null;
+        this.subscribers = new Map();
+        this.nextSubscriberId = 1;
         this.wsEndpoint = config.wsEndpoint || 'ws://localhost:3000/graphql';
-    }
-    setAuthToken(token) {
-        this.token = token;
+        this.authState = authState;
+    }
+    /**
+     * Register handlers for the udpNotifications stream. The first call opens
+     * the shared socket (provided we have a token); subsequent calls reuse it.
+     * The returned function detaches just this set of handlers and closes the
+     * socket once the last subscriber leaves.
+     */
+    subscribe(handlers) {
+        const id = `s${this.nextSubscriberId++}`;
+        this.subscribers.set(id, { id, handlers });
+        this.ensureSubscription();
+        return () => {
+            this.subscribers.delete(id);
+            this.checkIfShouldUnsubscribe();
+        };
     }
     ensureSubscription() {
         if (!this.wsClient ||
@@ -31,23 +41,18 @@ export class SubscriptionManager {
         }
     }
     startSubscription() {
-        if (!this.token) {
+        const token = this.authState.getToken();
+        if (!token) {
             throw new Error('Must be authenticated to subscribe');
         }
-        if (this.wsClient &&
-            (this.wsClient.readyState === WebSocket.OPEN ||
-                this.wsClient.readyState === WebSocket.CONNECTING)) {
-            return; // Already connected or connecting
-        }
-        const wsUrl = this.wsEndpoint;
-        this.subscriptionId = 'udp-notifications-' + Date.now();
-        const ws = new WebSocket(wsUrl, 'graphql-transport-ws');
+        this.subscriptionId = `udp-notifications-${Date.now()}`;
+        const ws = new WebSocket(this.wsEndpoint, 'graphql-transport-ws');
         this.wsClient = ws;
         ws.onopen = () => {
             ws.send(JSON.stringify({
                 type: 'connection_init',
                 payload: {
-                    Authorization: `Bearer ${this.token}`,
+                    Authorization: `Bearer ${token}`,
                 },
             }));
         };
@@ -55,55 +60,30 @@ export class SubscriptionManager {
             try {
                 const message = JSON.parse(typeof event.data === 'string' ? event.data : '');
                 if (message.type === 'connection_ack') {
-                    const subscribeMessage = {
+                    ws.send(JSON.stringify({
                         id: this.subscriptionId,
                         type: 'subscribe',
-                        payload: {
-                            query: `subscription {
-                udpNotifications {
-                  __typename
-                  ... on ActorUpdateNotification { mapId chunkX chunkY chunkZ distance decayRate uuid state sequenceNumber epochMillis }
-                  ... on VoxelUpdateNotification { mapId chunkX chunkY chunkZ distance decayRate uuid voxelX voxelY voxelZ voxelType voxelState sequenceNumber epochMillis }
-                  ... on GenericErrorResponse { sequenceNumber errorCode }
-                  ... on ActorUpdateResponse { mapId chunkX chunkY chunkZ distance decayRate uuid sequenceNumber epochMillis }
-                  ... on VoxelUpdateResponse { mapId chunkX chunkY chunkZ distance decayRate uuid sequenceNumber epochMillis }
-                  ... on ClientAudioNotification { mapId chunkX chunkY chunkZ distance decayRate uuid audioData sequenceNumber epochMillis }
-                  ... on ClientTextNotification { mapId chunkX chunkY chunkZ distance decayRate uuid text sequenceNumber epochMillis }
-                  ... on ClientEventNotification { mapId chunkX chunkY chunkZ distance decayRate uuid eventType state sequenceNumber epochMillis }
-                  ... on ServerEventNotification { mapId chunkX chunkY chunkZ distance decayRate uuid eventType state sequenceNumber epochMillis }
-                }
-              }`,
-                        },
-                    };
-                    ws.send(JSON.stringify(subscribeMessage));
+                        payload: { query: UDP_NOTIFICATIONS_QUERY },
+                    }));
                 }
                 else if (message.type === 'next') {
-                    if (message.payload?.data?.udpNotifications === null) {
+                    if (message.payload?.data?.udpNotifications === null)
                         return;
-                    }
-                    if (message.payload?.data?.udpNotifications) {
-                        const notification = message.payload.data.udpNotifications;
-                        this.handleNotification(notification);
+                    const notification = message.payload?.data
+                        ?.udpNotifications;
+                    if (notification) {
+                        this.dispatch(notification);
                     }
                     else if (message.payload?.errors) {
                         console.error('Subscription errors:', message.payload.errors);
-                        const firstError = message.payload.errors[0];
-                        const errorMsg = firstError?.message
-                            ? Array.isArray(firstError.message)
-                                ? firstError.message.join(', ')
-                                : String(firstError.message)
-                            : firstError?.extensions?.message || 'Unknown subscription error';
-                        console.error('Subscription error:', errorMsg);
                     }
                 }
                 else if (message.type === 'error') {
                     console.error('Subscription error:', message.payload);
                 }
                 else if (message.type === 'complete') {
-                    // Server ended the subscription
-                    if (this.wsClient === ws) {
+                    if (this.wsClient === ws)
                         this.wsClient = null;
-                    }
                 }
                 else if (message.type === 'ping') {
                     ws.send(JSON.stringify({ type: 'pong' }));
@@ -120,9 +100,8 @@ export class SubscriptionManager {
             if (event.code !== 1000) {
                 console.warn(`WebSocket closed unexpectedly: ${event.reason || event.code}`);
             }
-            if (this.wsClient === ws) {
+            if (this.wsClient === ws)
                 this.wsClient = null;
-            }
         };
         this.wsUnsubscribe = () => {
             if (ws.readyState === WebSocket.OPEN) {
@@ -134,145 +113,80 @@ export class SubscriptionManager {
                 }
                 ws.close();
             }
-            if (this.wsClient === ws) {
+            if (this.wsClient === ws)
                 this.wsClient = null;
-            }
             this.wsUnsubscribe = null;
         };
     }
-    handleNotification(notification) {
+    dispatch(notification) {
         const type = notification.__typename;
         if (!type) {
             console.warn('Received notification without __typename:', notification);
             return;
         }
-        const handlers = this.handlers[type];
-        if (handlers && handlers.length > 0) {
-            handlers.forEach((handler) => {
-                try {
-                    handler(notification);
-                }
-                catch (error) {
-                    console.error(`Error in handler for ${type}:`, error);
+        // Snapshot the subscribers list so handlers that mutate the registry
+        // (e.g. by calling close()) don't affect this dispatch loop.
+        for (const sub of [...this.subscribers.values()]) {
+            try {
+                switch (type) {
+                    case 'ActorUpdateNotification':
+                        sub.handlers.onActorUpdate?.(notification);
+                        break;
+                    case 'ActorUpdateResponse':
+                        sub.handlers.onActorUpdateResponse?.(notification);
+                        break;
+                    case 'VoxelUpdateNotification':
+                        sub.handlers.onVoxelUpdate?.(notification);
+                        break;
+                    case 'VoxelUpdateResponse':
+                        sub.handlers.onVoxelUpdateResponse?.(notification);
+                        break;
+                    case 'ClientAudioNotification':
+                        sub.handlers.onClientAudio?.(notification);
+                        break;
+                    case 'ClientTextNotification':
+                        sub.handlers.onClientText?.(notification);
+                        break;
+                    case 'ClientEventNotification':
+                        sub.handlers.onClientEvent?.(notification);
+                        break;
+                    case 'ServerEventNotification':
+                        sub.handlers.onServerEvent?.(notification);
+                        break;
+                    case 'GenericErrorResponse':
+                        sub.handlers.onGenericError?.(notification);
+                        break;
                 }
-            });
-        }
-    }
-    onActorUpdate(handler) {
-        this.handlers.ActorUpdateNotification.push(handler);
-        this.ensureSubscription();
-        return () => {
-            const index = this.handlers.ActorUpdateNotification.indexOf(handler);
-            if (index > -1) {
-                this.handlers.ActorUpdateNotification.splice(index, 1);
-            }
-            this.checkIfShouldUnsubscribe();
-        };
-    }
-    onActorUpdateResponse(handler) {
-        this.handlers.ActorUpdateResponse.push(handler);
-        this.ensureSubscription();
-        return () => {
-            const index = this.handlers.ActorUpdateResponse.indexOf(handler);
-            if (index > -1) {
-                this.handlers.ActorUpdateResponse.splice(index, 1);
-            }
-            this.checkIfShouldUnsubscribe();
-        };
-    }
-    onVoxelUpdate(handler) {
-        this.handlers.VoxelUpdateNotification.push(handler);
-        this.ensureSubscription();
-        return () => {
-            const index = this.handlers.VoxelUpdateNotification.indexOf(handler);
-            if (index > -1) {
-                this.handlers.VoxelUpdateNotification.splice(index, 1);
             }
-            this.checkIfShouldUnsubscribe();
-        };
-    }
-    onVoxelUpdateResponse(handler) {
-        this.handlers.VoxelUpdateResponse.push(handler);
-        this.ensureSubscription();
-        return () => {
-            const index = this.handlers.VoxelUpdateResponse.indexOf(handler);
-            if (index > -1) {
-                this.handlers.VoxelUpdateResponse.splice(index, 1);
-            }
-            this.checkIfShouldUnsubscribe();
-        };
-    }
-    onClientAudio(handler) {
-        this.handlers.ClientAudioNotification.push(handler);
-        this.ensureSubscription();
-        return () => {
-            const index = this.handlers.ClientAudioNotification.indexOf(handler);
-            if (index > -1) {
-                this.handlers.ClientAudioNotification.splice(index, 1);
-            }
-            this.checkIfShouldUnsubscribe();
-        };
-    }
-    onClientText(handler) {
-        this.handlers.ClientTextNotification.push(handler);
-        this.ensureSubscription();
-        return () => {
-            const index = this.handlers.ClientTextNotification.indexOf(handler);
-            if (index > -1) {
-                this.handlers.ClientTextNotification.splice(index, 1);
-            }
-            this.checkIfShouldUnsubscribe();
-        };
-    }
-    onClientEvent(handler) {
-        this.handlers.ClientEventNotification.push(handler);
-        this.ensureSubscription();
-        return () => {
-            const index = this.handlers.ClientEventNotification.indexOf(handler);
-            if (index > -1) {
-                this.handlers.ClientEventNotification.splice(index, 1);
-            }
-            this.checkIfShouldUnsubscribe();
-        };
-    }
-    onServerEvent(handler) {
-        this.handlers.ServerEventNotification.push(handler);
-        this.ensureSubscription();
-        return () => {
-            const index = this.handlers.ServerEventNotification.indexOf(handler);
-            if (index > -1) {
-                this.handlers.ServerEventNotification.splice(index, 1);
-            }
-            this.checkIfShouldUnsubscribe();
-        };
-    }
-    onGenericError(handler) {
-        this.handlers.GenericErrorResponse.push(handler);
-        this.ensureSubscription();
-        return () => {
-            const index = this.handlers.GenericErrorResponse.indexOf(handler);
-            if (index > -1) {
-                this.handlers.GenericErrorResponse.splice(index, 1);
+            catch (error) {
+                console.error(`Handler for ${type} threw:`, error);
             }
-            this.checkIfShouldUnsubscribe();
-        };
+        }
     }
     checkIfShouldUnsubscribe() {
-        // Check if any handlers are still registered
-        const hasHandlers = Object.values(this.handlers).some((handlers) => handlers.length > 0);
-        if (!hasHandlers && this.wsUnsubscribe) {
+        if (this.subscribers.size === 0 && this.wsUnsubscribe) {
             this.wsUnsubscribe();
             this.wsUnsubscribe = null;
         }
     }
     close() {
-        // Clear all handlers
-        Object.keys(this.handlers).forEach((key) => {
-            this.handlers[key] = [];
-        });
-        // Close WebSocket if open
+        this.subscribers.clear();
         if (this.wsUnsubscribe) {
             this.wsUnsubscribe();
         }
     }
 }
+const UDP_NOTIFICATIONS_QUERY = `subscription {
+  udpNotifications {
+    __typename
+    ... on ActorUpdateNotification { appId chunkX chunkY chunkZ distance decayRate uuid state sequenceNumber epochMillis }
+    ... on VoxelUpdateNotification { appId chunkX chunkY chunkZ distance decayRate uuid voxelX voxelY voxelZ voxelType voxelState sequenceNumber epochMillis }
+    ... on GenericErrorResponse { sequenceNumber errorCode }
+    ... on ActorUpdateResponse { appId chunkX chunkY chunkZ distance decayRate uuid sequenceNumber epochMillis }
+    ... on VoxelUpdateResponse { appId chunkX chunkY chunkZ distance decayRate uuid sequenceNumber epochMillis }
+    ... on ClientAudioNotification { appId chunkX chunkY chunkZ distance decayRate uuid audioData sequenceNumber epochMillis }
+    ... on ClientTextNotification { appId chunkX chunkY chunkZ distance decayRate uuid text sequenceNumber epochMillis }
+    ... on ClientEventNotification { appId chunkX chunkY chunkZ distance decayRate uuid eventType state sequenceNumber epochMillis }
+    ... on ServerEventNotification { appId chunkX chunkY chunkZ distance decayRate uuid eventType state sequenceNumber epochMillis }
+  }
+}`;