@voicemaster/core 1.0.10 → 1.0.12

package/dist/index.d.mts

@@ -10,13 +10,17 @@ declare class VoiceClient {
     private pc;
     private localStream;
     private remoteStream;
+    private audioSender;
     private eventHandlers;
     private signalingUrl;
     private roomId;
     private userId;
     private iceServers;
     private isConnectedFlag;
+    private isMutedFlag;
     private targetUserId;
+    private connectingPromise;
+    private peers;
     constructor(config: VoiceClientConfig);
     on(event: string, callback: Function): void;
     private emit;
@@ -31,6 +35,7 @@ declare class VoiceClient {
     private handleCandidate;
     private send;
     disconnect(): void;
+    getPeers(): string[];
     toggleMute(): void;
     isMuted(): boolean;
     getUserId(): string;

package/dist/index.d.ts

@@ -10,13 +10,17 @@ declare class VoiceClient {
     private pc;
     private localStream;
     private remoteStream;
+    private audioSender;
     private eventHandlers;
     private signalingUrl;
     private roomId;
     private userId;
     private iceServers;
     private isConnectedFlag;
+    private isMutedFlag;
     private targetUserId;
+    private connectingPromise;
+    private peers;
     constructor(config: VoiceClientConfig);
     on(event: string, callback: Function): void;
     private emit;
@@ -31,6 +35,7 @@ declare class VoiceClient {
     private handleCandidate;
     private send;
     disconnect(): void;
+    getPeers(): string[];
     toggleMute(): void;
     isMuted(): boolean;
     getUserId(): string;

package/dist/index.js

@@ -31,9 +31,13 @@ var VoiceClient = class {
     this.pc = null;
     this.localStream = null;
     this.remoteStream = null;
+    this.audioSender = null;
     this.eventHandlers = /* @__PURE__ */ new Map();
     this.isConnectedFlag = false;
+    this.isMutedFlag = 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 +45,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 +61,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({
@@ -78,10 +91,20 @@ var VoiceClient = class {
   initPeerConnection() {
     this.pc = new RTCPeerConnection({ iceServers: this.iceServers });
     this.localStream?.getTracks().forEach((track) => {
-      this.pc.addTrack(track, this.localStream);
+      const sender = this.pc.addTrack(track, this.localStream);
+      if (track.kind === "audio") {
+        this.audioSender = sender;
+      }
     });
     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 from peer", {
+        track: event.track,
+        stream,
+        fromUserId: this.targetUserId,
+        myUserId: this.userId
+      });
       this.emit("remoteStream", this.remoteStream);
     };
     this.pc.onicecandidate = (event) => {
@@ -105,13 +128,19 @@ 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");
     };
   }
@@ -121,6 +150,7 @@ var VoiceClient = class {
       case "user-joined":
         console.log("[VoiceClient] User joined, myId:", this.userId, "theirId:", message.userId);
         if (message.userId !== this.userId) {
+          this.peers.add(message.userId);
           console.log("[VoiceClient] Creating offer...");
           this.targetUserId = message.userId;
           await this.createOffer();
@@ -143,6 +173,7 @@ var VoiceClient = class {
         await this.handleCandidate(message);
         break;
       case "user-left":
+        this.peers.delete(message.userId);
         this.emit("userLeft", message.userId);
         break;
       default:
@@ -193,9 +224,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();
@@ -207,16 +241,43 @@ 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];
-      if (audioTrack) {
-        audioTrack.enabled = !audioTrack.enabled;
-      }
+    if (!this.localStream) {
+      console.warn("[VoiceClient] No local stream available for muting");
+      return;
+    }
+    const audioTrack = this.localStream.getAudioTracks()[0];
+    if (!audioTrack) {
+      console.warn("[VoiceClient] No audio track found for muting");
+      return;
+    }
+    const shouldMute = audioTrack.enabled;
+    audioTrack.enabled = !shouldMute;
+    this.isMutedFlag = !shouldMute;
+    if (this.audioSender) {
+      this.audioSender.replaceTrack(shouldMute ? null : audioTrack).then(() => {
+        console.log("[VoiceClient] Audio sender replaced after mute toggle", {
+          muted: this.isMutedFlag,
+          trackId: audioTrack.id,
+          enabled: audioTrack.enabled
+        });
+      }).catch((err) => {
+        console.error("[VoiceClient] Failed to replace audio sender track", err);
+      });
     }
+    console.log(`[VoiceClient] Mute toggled: now ${this.isMutedFlag ? "muted" : "unmuted"}`, {
+      trackId: audioTrack.id,
+      enabled: audioTrack.enabled,
+      state: audioTrack.readyState
+    });
   }
   isMuted() {
-    return this.localStream?.getAudioTracks()[0]?.enabled === false;
+    const muted = this.isMutedFlag;
+    console.log("[VoiceClient] isMuted check:", { muted });
+    return muted;
   }
   getUserId() {
     return this.userId;

package/dist/index.mjs

@@ -5,9 +5,13 @@ var VoiceClient = class {
     this.pc = null;
     this.localStream = null;
     this.remoteStream = null;
+    this.audioSender = null;
     this.eventHandlers = /* @__PURE__ */ new Map();
     this.isConnectedFlag = false;
+    this.isMutedFlag = 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 +19,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 +35,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({
@@ -52,10 +65,20 @@ var VoiceClient = class {
   initPeerConnection() {
     this.pc = new RTCPeerConnection({ iceServers: this.iceServers });
     this.localStream?.getTracks().forEach((track) => {
-      this.pc.addTrack(track, this.localStream);
+      const sender = this.pc.addTrack(track, this.localStream);
+      if (track.kind === "audio") {
+        this.audioSender = sender;
+      }
     });
     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 from peer", {
+        track: event.track,
+        stream,
+        fromUserId: this.targetUserId,
+        myUserId: this.userId
+      });
       this.emit("remoteStream", this.remoteStream);
     };
     this.pc.onicecandidate = (event) => {
@@ -79,13 +102,19 @@ 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");
     };
   }
@@ -95,6 +124,7 @@ var VoiceClient = class {
       case "user-joined":
         console.log("[VoiceClient] User joined, myId:", this.userId, "theirId:", message.userId);
         if (message.userId !== this.userId) {
+          this.peers.add(message.userId);
           console.log("[VoiceClient] Creating offer...");
           this.targetUserId = message.userId;
           await this.createOffer();
@@ -117,6 +147,7 @@ var VoiceClient = class {
         await this.handleCandidate(message);
         break;
       case "user-left":
+        this.peers.delete(message.userId);
         this.emit("userLeft", message.userId);
         break;
       default:
@@ -167,9 +198,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();
@@ -181,16 +215,43 @@ 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];
-      if (audioTrack) {
-        audioTrack.enabled = !audioTrack.enabled;
-      }
+    if (!this.localStream) {
+      console.warn("[VoiceClient] No local stream available for muting");
+      return;
+    }
+    const audioTrack = this.localStream.getAudioTracks()[0];
+    if (!audioTrack) {
+      console.warn("[VoiceClient] No audio track found for muting");
+      return;
+    }
+    const shouldMute = audioTrack.enabled;
+    audioTrack.enabled = !shouldMute;
+    this.isMutedFlag = !shouldMute;
+    if (this.audioSender) {
+      this.audioSender.replaceTrack(shouldMute ? null : audioTrack).then(() => {
+        console.log("[VoiceClient] Audio sender replaced after mute toggle", {
+          muted: this.isMutedFlag,
+          trackId: audioTrack.id,
+          enabled: audioTrack.enabled
+        });
+      }).catch((err) => {
+        console.error("[VoiceClient] Failed to replace audio sender track", err);
+      });
     }
+    console.log(`[VoiceClient] Mute toggled: now ${this.isMutedFlag ? "muted" : "unmuted"}`, {
+      trackId: audioTrack.id,
+      enabled: audioTrack.enabled,
+      state: audioTrack.readyState
+    });
   }
   isMuted() {
-    return this.localStream?.getAudioTracks()[0]?.enabled === false;
+    const muted = this.isMutedFlag;
+    console.log("[VoiceClient] isMuted check:", { muted });
+    return muted;
   }
   getUserId() {
     return this.userId;

package/package.json

@@ -1,10 +1,16 @@
 {
   "name": "@voicemaster/core",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "WebRTC voice communication core library",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",

package/src/VoiceClient.ts

@@ -1,240 +0,0 @@
-export interface VoiceClientConfig {
-  signalingUrl: string;
-  roomId: string;
-  userId: string;
-  autoConnect?: boolean;
-  iceServers?: RTCIceServer[];
-}
-
-export class VoiceClient {
-  private ws: WebSocket | null = null;
-  private pc: RTCPeerConnection | null = null;
-  private localStream: MediaStream | null = null;
-  private remoteStream: MediaStream | null = null;
-  private eventHandlers: Map<string, Function[]> = new Map();
-  private signalingUrl: string;
-  private roomId: string;
-  private userId: string;
-  private iceServers: RTCIceServer[];
-  private isConnectedFlag = false;
-  private targetUserId: string | null = null;
-
-  constructor(config: VoiceClientConfig) {
-    this.signalingUrl = config.signalingUrl;
-    this.roomId = config.roomId;
-    this.userId = config.userId;
-    this.iceServers = config.iceServers || [
-      { urls: 'stun:stun.l.google.com:19302' }
-    ];
-
-    if (config.autoConnect !== false) {
-      this.connect();
-    }
-  }
-
-  on(event: string, callback: Function): void {
-    if (!this.eventHandlers.has(event)) {
-      this.eventHandlers.set(event, []);
-    }
-    this.eventHandlers.get(event)!.push(callback);
-  }
-
-
-
-  private emit(event: string, ...args: any[]): void {
-    const handlers = this.eventHandlers.get(event);
-    if (handlers) {
-      handlers.forEach(handler => handler(...args));
-    }
-  }
-
-  async connect(): Promise<void> {
-    try {
-      await this.initMicrophone();
-      this.initPeerConnection();
-      this.initWebSocket();
-    } catch (error) {
-      this.emit('error', error);
-    }
-  }
-
-  private async initMicrophone(): Promise<void> {
-    this.localStream = await navigator.mediaDevices.getUserMedia({
-      audio: {
-        echoCancellation: true,
-        noiseSuppression: true,
-        autoGainControl: true
-      }
-    });
-    this.emit('localStream', this.localStream);
-  }
-
-  private initPeerConnection(): void {
-    this.pc = new RTCPeerConnection({ iceServers: this.iceServers });
-
-    this.localStream?.getTracks().forEach(track => {
-      this.pc!.addTrack(track, this.localStream!);
-    });
-
-    this.pc.ontrack = (event) => {
-      this.remoteStream = event.streams[0];
-      this.emit('remoteStream', this.remoteStream);
-    };
-
-    this.pc.onicecandidate = (event) => {
-      if (event.candidate) {
-        this.send({
-          type: 'candidate',
-          candidate: event.candidate
-        });
-      }
-    };
-
-    this.pc.onconnectionstatechange = () => {
-      if (this.pc?.connectionState === 'connected') {
-        if (!this.isConnectedFlag) {
-          this.isConnectedFlag = true;
-          this.emit('connected');
-        }
-      }
-    };
-  }
-
-  private initWebSocket(): void {
-    const url = `${this.signalingUrl}?userId=${this.userId}&roomId=${this.roomId}`;
-    this.ws = new WebSocket(url);
-
-    this.ws.onopen = () => {
-      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.onclose = () => {
-      this.emit('disconnected');
-    };
-  }
-
-  private async handleSignalingMessage(message: any): Promise<void> {
-    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('[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('[VoiceClient] Received offer');
-        this.targetUserId = message.userId;
-        await this.handleOffer(message);
-        break;
-      case 'answer':
-        console.log('[VoiceClient] Received answer');
-        await this.handleAnswer(message);
-        break;
-      case 'candidate':
-        console.log('[VoiceClient] Received candidate');
-        await this.handleCandidate(message);
-        break;
-      case 'user-left':
-        this.emit('userLeft', message.userId);
-        break;
-      default:
-        console.log('[VoiceClient] Unknown message type:', message.type);
-    }
-  }
-
-  private async createOffer(): Promise<void> {
-    const offer = await this.pc!.createOffer();
-    await this.pc!.setLocalDescription(offer);
-    this.send({
-      type: 'offer',
-      sdp: this.pc!.localDescription
-    });
-  }
-
-  private async handleOffer(message: any): Promise<void> {
-    try {
-      console.log('Handling offer', message);
-      const offer = new RTCSessionDescription(message.sdp);
-      await this.pc!.setRemoteDescription(offer);
-      console.log('Remote description set');
-      
-      const answer = await this.pc!.createAnswer();
-      console.log('Answer created');
-      
-      await this.pc!.setLocalDescription(answer);
-      console.log('Local description set');
-      
-      this.send({
-        type: 'answer',
-        sdp: this.pc!.localDescription
-      });
-    } catch (err) {
-      console.error('Offer handling error:', err);
-    }
-  }
-
-  private async handleAnswer(message: any): Promise<void> {
-    const answer = new RTCSessionDescription(message.sdp);
-    await this.pc!.setRemoteDescription(answer);
-  }
-
-  private async handleCandidate(message: any): Promise<void> {
-    try {
-      if (message.candidate) {
-        const candidate = new RTCIceCandidate(message.candidate);
-        await this.pc!.addIceCandidate(candidate);
-        console.log('ICE candidate added');
-      }
-    } catch (err) {
-      console.error('Candidate error:', err);
-    }
-  }
-
-  private send(data: any): void {
-    if (this.ws?.readyState === WebSocket.OPEN) {
-      this.ws.send(JSON.stringify(data));
-    }
-  }
-
-  disconnect(): void {
-    if (this.ws) {
-      this.send({ type: 'leave', roomId: this.roomId, userId: this.userId });
-      this.ws.close();
-    }
-    this.pc?.close();
-    if (this.localStream) {
-      this.localStream.getTracks().forEach(track => track.stop());
-    }
-    this.isConnectedFlag = false;
-    this.emit('disconnected');
-  }
-
-  toggleMute(): void {
-    if (this.localStream) {
-      const audioTrack = this.localStream.getAudioTracks()[0];
-      if (audioTrack) {
-        audioTrack.enabled = !audioTrack.enabled;
-      }
-    }
-  }
-
-  isMuted(): boolean {
-    return this.localStream?.getAudioTracks()[0]?.enabled === false;
-  }
-
-  getUserId(): string {
-    return this.userId;
-  }
-}

package/src/index.ts

@@ -1,2 +0,0 @@
-export { VoiceClient } from './VoiceClient';
-export type { VoiceClientConfig } from './VoiceClient';

package/tsconfig.json

@@ -1,16 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2020",
-    "module": "ESNext",
-    "lib": ["ES2020", "DOM"],
-    "moduleResolution": "bundler",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "resolveJsonModule": true,
-    "noEmit": true
-  },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist", "**/*.test.ts"]
-}