@arena-im/buzz-client 1.4.0 → 1.5.0

package/src/lib/config.ts

@@ -25,15 +25,11 @@ const DEFAULTS: Record<BuzzEnvironment, BuzzEnvironmentConfig> = {
     websocketUrl:
       BUZZ_WEBSOCKET_URL_DEV && BUZZ_WEBSOCKET_URL_DEV.length > 0
         ? BUZZ_WEBSOCKET_URL_DEV
-        : BUZZ_WEBSOCKET_URL && BUZZ_WEBSOCKET_URL.length > 0
-          ? BUZZ_WEBSOCKET_URL
-          : "wss://buzz-prd.arena.im/ws",
+        : "wss://buzz-dev.arena.im/ws",
     identityUrl:
       IDENTITY_SERVICE_URL_DEV && IDENTITY_SERVICE_URL_DEV.length > 0
         ? IDENTITY_SERVICE_URL_DEV
-        : IDENTITY_SERVICE_URL && IDENTITY_SERVICE_URL.length > 0
-          ? IDENTITY_SERVICE_URL
-          : "https://token-service-prd.arena.im",
+        : "https://token-service-dev.arena.im",
   },
 };
 

package/src/lib/index.ts

@@ -7,7 +7,10 @@ import { TokenManager } from "./token-manager";
 
 import { Topic } from "./topic";
 import { BuzzEnvironment, resolveBuzzConfig } from "./config";
-import { TOKEN_UPDATED_EVENT, TokenUpdateEvent } from "./utils/dom-events";
+import {
+  dispatchTokenUpdatedEvent,
+  TokenType,
+} from "./utils/dom-events";
 
 // These should match buzz' throttling constants
 const throttleWindowDuration = 5000;
@@ -38,6 +41,7 @@ interface Message {
   topic?: string;
   reason?: string;
 }
+
 type ClientOptions = {
   commandTimeout?: number;
   websocket?: WebsocketOptions;
@@ -57,7 +61,6 @@ export class BuzzClient {
   eventListeners: Record<string, EventCallbackRegistry> = {};
   queue;
   private subscribedTopics = new Set<string>();
-  private unsubscribeTokenChange: (() => void) | null = null;
   private readonly websocketUrl: string;
   private readonly tokenManager: TokenManager;
   private readonly namespace: string;
@@ -98,19 +101,6 @@ export class BuzzClient {
 
     this.namespace = namespace;
     this.options = options;
-    this.setupIdTokenListener();
-  }
-
-  private setupIdTokenListener(): void {
-    // Only listen to browser events if running in a browser environment
-    if (typeof window !== "undefined") {
-      document.addEventListener(TOKEN_UPDATED_EVENT, ((
-        event: CustomEvent<TokenUpdateEvent["detail"]>,
-      ) => {
-        const { idToken } = event.detail;
-        this.setToken(idToken);
-      }) as EventListener);
-    }
   }
 
   private async getWebsocketUrl(): Promise<string> {
@@ -134,9 +124,16 @@ export class BuzzClient {
 
   async setTemporaryUser(username: string): Promise<string> {
     const buzzToken = await this.tokenManager.setTemporaryUser(username);
+
+    const idToken = this.tokenManager.getIdToken();
+    if (idToken) {
+      dispatchTokenUpdatedEvent(TokenType.GUEST, { idToken });
+    }
+
     if (this.ws) this.ws.close();
     this.ws = await this.createSocket();
     await this.ws.whenOpen();
+
     return buzzToken;
   }
 
@@ -261,10 +258,6 @@ export class BuzzClient {
       this.ws.close();
       this.ws = null;
     }
-    if (this.unsubscribeTokenChange) {
-      this.unsubscribeTokenChange();
-      this.unsubscribeTokenChange = null;
-    }
     this.queue.destroy();
     this.pendingCommands = {};
     this.eventListeners = {};

package/src/lib/token-manager.ts

@@ -72,13 +72,13 @@ export class TokenManager {
       throw new Error("getTemporaryUserToken failed: missing token");
     }
     if (typeof parsed === "string" && parsed.trim().length > 0) {
-      return parsed;
+      return parsed.trim();
     }
     if (parsed && typeof parsed === "object") {
       const maybeToken =
         (parsed as { token?: string }).token ??
         (parsed as { access_token?: string }).access_token;
-      if (maybeToken && maybeToken.length > 0) return maybeToken;
+      if (maybeToken && maybeToken.length > 0) return maybeToken.trim();
     }
     throw new Error("getTemporaryUserToken failed: missing token");
   }
@@ -95,6 +95,10 @@ export class TokenManager {
     return this.exchange();
   }
 
+  public getIdToken(): string | null {
+    return this.currentIdToken ?? null;
+  }
+
   public async setTemporaryUser(username: string): Promise<string> {
     const tempToken = await this.getTemporaryUserToken(username);
     this.currentIdToken = tempToken;

package/src/lib/utils/dom-events.ts

@@ -15,3 +15,24 @@ export interface TokenUpdateEvent {
     source?: string;
   };
 }
+
+interface TokenEventParams {
+  idToken: string | null;
+  refreshToken?: string | null;
+  source?: string;
+}
+
+export function dispatchTokenUpdatedEvent(
+  type: TokenType,
+  params: TokenEventParams,
+) {
+  if (typeof document === "undefined") {
+    return;
+  }
+
+  document.dispatchEvent(
+    new CustomEvent(TOKEN_UPDATED_EVENT, {
+      detail: { ...params, type },
+    }),
+  );
+}