@voicemaster/core 1.0.9 → 1.0.11

package/dist/index.d.mts

@@ -17,6 +17,8 @@ declare class VoiceClient {
     private iceServers;
     private isConnectedFlag;
     private targetUserId;
+    private connectingPromise;
+    private peers;
     constructor(config: VoiceClientConfig);
     on(event: string, callback: Function): void;
     private emit;
@@ -31,6 +33,7 @@ declare class VoiceClient {
     private handleCandidate;
     private send;
     disconnect(): void;
+    getPeers(): string[];
     toggleMute(): void;
     isMuted(): boolean;
     getUserId(): string;

package/dist/index.d.ts

@@ -17,6 +17,8 @@ declare class VoiceClient {
     private iceServers;
     private isConnectedFlag;
     private targetUserId;
+    private connectingPromise;
+    private peers;
     constructor(config: VoiceClientConfig);
     on(event: string, callback: Function): void;
     private emit;
@@ -31,6 +33,7 @@ declare class VoiceClient {
     private handleCandidate;
     private send;
     disconnect(): void;
+    getPeers(): string[];
     toggleMute(): void;
     isMuted(): boolean;
     getUserId(): string;

package/dist/index.js

@@ -34,6 +34,8 @@ var VoiceClient = class {
     this.eventHandlers = /* @__PURE__ */ new Map();
     this.isConnectedFlag = false;
     this.targetUserId = null;
+    this.connectingPromise = null;
+    this.peers = /* @__PURE__ */ new Set();
     this.signalingUrl = config.signalingUrl;
     this.roomId = config.roomId;
     this.userId = config.userId;
@@ -41,7 +43,7 @@ var VoiceClient = class {
       { urls: "stun:stun.l.google.com:19302" }
     ];
     if (config.autoConnect !== false) {
-      this.connect();
+      Promise.resolve().then(() => this.connect());
     }
   }
   on(event, callback) {
@@ -57,13 +59,22 @@ var VoiceClient = class {
     }
   }
   async connect() {
-    try {
-      await this.initMicrophone();
-      this.initPeerConnection();
-      this.initWebSocket();
-    } catch (error) {
-      this.emit("error", error);
+    if (this.connectingPromise) {
+      return this.connectingPromise;
     }
+    this.connectingPromise = (async () => {
+      try {
+        await this.initMicrophone();
+        this.initPeerConnection();
+        this.initWebSocket();
+      } catch (error) {
+        this.emit("error", error);
+        throw error;
+      } finally {
+        this.connectingPromise = null;
+      }
+    })();
+    return this.connectingPromise;
   }
   async initMicrophone() {
     this.localStream = await navigator.mediaDevices.getUserMedia({
@@ -81,7 +92,9 @@ var VoiceClient = class {
       this.pc.addTrack(track, this.localStream);
     });
     this.pc.ontrack = (event) => {
-      this.remoteStream = event.streams[0];
+      const stream = event.streams?.[0] || new MediaStream([event.track]);
+      this.remoteStream = stream;
+      console.log("[VoiceClient] Remote track received", { track: event.track, stream });
       this.emit("remoteStream", this.remoteStream);
     };
     this.pc.onicecandidate = (event) => {
@@ -105,43 +118,56 @@ var VoiceClient = class {
     const url = `${this.signalingUrl}?userId=${this.userId}&roomId=${this.roomId}`;
     this.ws = new WebSocket(url);
     this.ws.onopen = () => {
+      console.log("[VoiceClient] WebSocket connected");
       this.send({ type: "join", roomId: this.roomId, userId: this.userId });
     };
     this.ws.onmessage = async (event) => {
       const message = JSON.parse(event.data);
       await this.handleSignalingMessage(message);
     };
+    this.ws.onerror = (event) => {
+      console.error("[VoiceClient] WebSocket error", event);
+      this.emit("error", new Error("WebSocket error"));
+    };
     this.ws.onclose = () => {
+      console.log("[VoiceClient] WebSocket closed");
       this.emit("disconnected");
     };
   }
   async handleSignalingMessage(message) {
-    console.log("Received:", message.type, message);
+    console.log("[VoiceClient] Received message:", message.type, message);
     switch (message.type) {
       case "user-joined":
+        console.log("[VoiceClient] User joined, myId:", this.userId, "theirId:", message.userId);
         if (message.userId !== this.userId) {
-          console.log("User joined, creating offer...");
+          this.peers.add(message.userId);
+          console.log("[VoiceClient] Creating offer...");
           this.targetUserId = message.userId;
           await this.createOffer();
           this.emit("userJoined", message.userId);
+        } else {
+          console.log("[VoiceClient] Ignoring my own join");
         }
         break;
       case "offer":
-        console.log("Received offer, handling...");
+        console.log("[VoiceClient] Received offer");
         this.targetUserId = message.userId;
         await this.handleOffer(message);
         break;
       case "answer":
-        console.log("Received answer, handling...");
+        console.log("[VoiceClient] Received answer");
         await this.handleAnswer(message);
         break;
       case "candidate":
-        console.log("Received candidate, handling...");
+        console.log("[VoiceClient] Received candidate");
         await this.handleCandidate(message);
         break;
       case "user-left":
+        this.peers.delete(message.userId);
         this.emit("userLeft", message.userId);
         break;
+      default:
+        console.log("[VoiceClient] Unknown message type:", message.type);
     }
   }
   async createOffer() {
@@ -188,9 +214,12 @@ var VoiceClient = class {
   send(data) {
     if (this.ws?.readyState === WebSocket.OPEN) {
       this.ws.send(JSON.stringify(data));
+    } else {
+      console.warn("[VoiceClient] WebSocket is not open, cannot send message", data);
     }
   }
   disconnect() {
+    this.peers.clear();
     if (this.ws) {
       this.send({ type: "leave", roomId: this.roomId, userId: this.userId });
       this.ws.close();
@@ -202,6 +231,9 @@ var VoiceClient = class {
     this.isConnectedFlag = false;
     this.emit("disconnected");
   }
+  getPeers() {
+    return Array.from(this.peers);
+  }
   toggleMute() {
     if (this.localStream) {
       const audioTrack = this.localStream.getAudioTracks()[0];

package/dist/index.mjs

@@ -8,6 +8,8 @@ var VoiceClient = class {
     this.eventHandlers = /* @__PURE__ */ new Map();
     this.isConnectedFlag = false;
     this.targetUserId = null;
+    this.connectingPromise = null;
+    this.peers = /* @__PURE__ */ new Set();
     this.signalingUrl = config.signalingUrl;
     this.roomId = config.roomId;
     this.userId = config.userId;
@@ -15,7 +17,7 @@ var VoiceClient = class {
       { urls: "stun:stun.l.google.com:19302" }
     ];
     if (config.autoConnect !== false) {
-      this.connect();
+      Promise.resolve().then(() => this.connect());
     }
   }
   on(event, callback) {
@@ -31,13 +33,22 @@ var VoiceClient = class {
     }
   }
   async connect() {
-    try {
-      await this.initMicrophone();
-      this.initPeerConnection();
-      this.initWebSocket();
-    } catch (error) {
-      this.emit("error", error);
+    if (this.connectingPromise) {
+      return this.connectingPromise;
     }
+    this.connectingPromise = (async () => {
+      try {
+        await this.initMicrophone();
+        this.initPeerConnection();
+        this.initWebSocket();
+      } catch (error) {
+        this.emit("error", error);
+        throw error;
+      } finally {
+        this.connectingPromise = null;
+      }
+    })();
+    return this.connectingPromise;
   }
   async initMicrophone() {
     this.localStream = await navigator.mediaDevices.getUserMedia({
@@ -55,7 +66,9 @@ var VoiceClient = class {
       this.pc.addTrack(track, this.localStream);
     });
     this.pc.ontrack = (event) => {
-      this.remoteStream = event.streams[0];
+      const stream = event.streams?.[0] || new MediaStream([event.track]);
+      this.remoteStream = stream;
+      console.log("[VoiceClient] Remote track received", { track: event.track, stream });
       this.emit("remoteStream", this.remoteStream);
     };
     this.pc.onicecandidate = (event) => {
@@ -79,43 +92,56 @@ var VoiceClient = class {
     const url = `${this.signalingUrl}?userId=${this.userId}&roomId=${this.roomId}`;
     this.ws = new WebSocket(url);
     this.ws.onopen = () => {
+      console.log("[VoiceClient] WebSocket connected");
       this.send({ type: "join", roomId: this.roomId, userId: this.userId });
     };
     this.ws.onmessage = async (event) => {
       const message = JSON.parse(event.data);
       await this.handleSignalingMessage(message);
     };
+    this.ws.onerror = (event) => {
+      console.error("[VoiceClient] WebSocket error", event);
+      this.emit("error", new Error("WebSocket error"));
+    };
     this.ws.onclose = () => {
+      console.log("[VoiceClient] WebSocket closed");
       this.emit("disconnected");
     };
   }
   async handleSignalingMessage(message) {
-    console.log("Received:", message.type, message);
+    console.log("[VoiceClient] Received message:", message.type, message);
     switch (message.type) {
       case "user-joined":
+        console.log("[VoiceClient] User joined, myId:", this.userId, "theirId:", message.userId);
         if (message.userId !== this.userId) {
-          console.log("User joined, creating offer...");
+          this.peers.add(message.userId);
+          console.log("[VoiceClient] Creating offer...");
           this.targetUserId = message.userId;
           await this.createOffer();
           this.emit("userJoined", message.userId);
+        } else {
+          console.log("[VoiceClient] Ignoring my own join");
         }
         break;
       case "offer":
-        console.log("Received offer, handling...");
+        console.log("[VoiceClient] Received offer");
         this.targetUserId = message.userId;
         await this.handleOffer(message);
         break;
       case "answer":
-        console.log("Received answer, handling...");
+        console.log("[VoiceClient] Received answer");
         await this.handleAnswer(message);
         break;
       case "candidate":
-        console.log("Received candidate, handling...");
+        console.log("[VoiceClient] Received candidate");
         await this.handleCandidate(message);
         break;
       case "user-left":
+        this.peers.delete(message.userId);
         this.emit("userLeft", message.userId);
         break;
+      default:
+        console.log("[VoiceClient] Unknown message type:", message.type);
     }
   }
   async createOffer() {
@@ -162,9 +188,12 @@ var VoiceClient = class {
   send(data) {
     if (this.ws?.readyState === WebSocket.OPEN) {
       this.ws.send(JSON.stringify(data));
+    } else {
+      console.warn("[VoiceClient] WebSocket is not open, cannot send message", data);
     }
   }
   disconnect() {
+    this.peers.clear();
     if (this.ws) {
       this.send({ type: "leave", roomId: this.roomId, userId: this.userId });
       this.ws.close();
@@ -176,6 +205,9 @@ var VoiceClient = class {
     this.isConnectedFlag = false;
     this.emit("disconnected");
   }
+  getPeers() {
+    return Array.from(this.peers);
+  }
   toggleMute() {
     if (this.localStream) {
       const audioTrack = this.localStream.getAudioTracks()[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voicemaster/core",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "WebRTC voice communication core library",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package/src/VoiceClient.ts

@@ -18,6 +18,8 @@ export class VoiceClient {
   private iceServers: RTCIceServer[];
   private isConnectedFlag = false;
   private targetUserId: string | null = null;
+  private connectingPromise: Promise<void> | null = null;
+  private peers: Set<string> = new Set();
 
   constructor(config: VoiceClientConfig) {
     this.signalingUrl = config.signalingUrl;
@@ -28,7 +30,7 @@ export class VoiceClient {
     ];
 
     if (config.autoConnect !== false) {
-      this.connect();
+      Promise.resolve().then(() => this.connect());
     }
   }
 
@@ -49,13 +51,24 @@ export class VoiceClient {
   }
 
   async connect(): Promise<void> {
-    try {
-      await this.initMicrophone();
-      this.initPeerConnection();
-      this.initWebSocket();
-    } catch (error) {
-      this.emit('error', error);
+    if (this.connectingPromise) {
+      return this.connectingPromise;
     }
+
+    this.connectingPromise = (async () => {
+      try {
+        await this.initMicrophone();
+        this.initPeerConnection();
+        this.initWebSocket();
+      } catch (error) {
+        this.emit('error', error);
+        throw error;
+      } finally {
+        this.connectingPromise = null;
+      }
+    })();
+
+    return this.connectingPromise;
   }
 
   private async initMicrophone(): Promise<void> {
@@ -77,7 +90,9 @@ export class VoiceClient {
     });
 
     this.pc.ontrack = (event) => {
-      this.remoteStream = event.streams[0];
+      const stream = event.streams?.[0] || new MediaStream([event.track]);
+      this.remoteStream = stream;
+      console.log('[VoiceClient] Remote track received', { track: event.track, stream });
       this.emit('remoteStream', this.remoteStream);
     };
 
@@ -105,6 +120,7 @@ export class VoiceClient {
     this.ws = new WebSocket(url);
 
     this.ws.onopen = () => {
+      console.log('[VoiceClient] WebSocket connected');
       this.send({ type: 'join', roomId: this.roomId, userId: this.userId });
     };
 
@@ -113,39 +129,52 @@ export class VoiceClient {
       await this.handleSignalingMessage(message);
     };
 
+    this.ws.onerror = (event) => {
+      console.error('[VoiceClient] WebSocket error', event);
+      this.emit('error', new Error('WebSocket error'));
+    };
+
     this.ws.onclose = () => {
+      console.log('[VoiceClient] WebSocket closed');
       this.emit('disconnected');
     };
   }
 
   private async handleSignalingMessage(message: any): Promise<void> {
-    console.log('Received:', message.type, message);
+    console.log('[VoiceClient] Received message:', message.type, message);
     
     switch (message.type) {
       case 'user-joined':
+        console.log('[VoiceClient] User joined, myId:', this.userId, 'theirId:', message.userId);
         if (message.userId !== this.userId) {
-          console.log('User joined, creating offer...');
+          this.peers.add(message.userId);
+          console.log('[VoiceClient] Creating offer...');
           this.targetUserId = message.userId;
           await this.createOffer();
           this.emit('userJoined', message.userId);
+        } else {
+          console.log('[VoiceClient] Ignoring my own join');
         }
         break;
       case 'offer':
-        console.log('Received offer, handling...');
+        console.log('[VoiceClient] Received offer');
         this.targetUserId = message.userId;
         await this.handleOffer(message);
         break;
       case 'answer':
-        console.log('Received answer, handling...');
+        console.log('[VoiceClient] Received answer');
         await this.handleAnswer(message);
         break;
       case 'candidate':
-        console.log('Received candidate, handling...');
+        console.log('[VoiceClient] Received candidate');
         await this.handleCandidate(message);
         break;
       case 'user-left':
+        this.peers.delete(message.userId);
         this.emit('userLeft', message.userId);
         break;
+      default:
+        console.log('[VoiceClient] Unknown message type:', message.type);
     }
   }
 
@@ -200,10 +229,13 @@ export class VoiceClient {
   private send(data: any): void {
     if (this.ws?.readyState === WebSocket.OPEN) {
       this.ws.send(JSON.stringify(data));
+    } else {
+      console.warn('[VoiceClient] WebSocket is not open, cannot send message', data);
     }
   }
 
   disconnect(): void {
+    this.peers.clear();
     if (this.ws) {
       this.send({ type: 'leave', roomId: this.roomId, userId: this.userId });
       this.ws.close();
@@ -216,6 +248,10 @@ export class VoiceClient {
     this.emit('disconnected');
   }
 
+  getPeers(): string[] {
+    return Array.from(this.peers);
+  }
+
   toggleMute(): void {
     if (this.localStream) {
       const audioTrack = this.localStream.getAudioTracks()[0];