@voicemaster/core 1.0.5 → 1.0.7

package/dist/index.d.mts

@@ -16,6 +16,7 @@ declare class VoiceClient {
     private userId;
     private iceServers;
     private isConnectedFlag;
+    private targetUserId;
     constructor(config: VoiceClientConfig);
     on(event: string, callback: Function): void;
     private emit;
@@ -34,16 +35,5 @@ declare class VoiceClient {
     isMuted(): boolean;
     getUserId(): string;
 }
-interface VoiceEvents {
-    connected: () => void;
-    disconnected: () => void;
-    remoteStream: (stream: MediaStream) => void;
-    localStream: (stream: MediaStream) => void;
-    error: (error: Error) => void;
-    userJoined: (userId: string) => void;
-    userLeft: (userId: string) => void;
-    speaking: (userId: string) => void;
-    stoppedSpeaking: (userId: string) => void;
-}
 
-export { VoiceClient, type VoiceClientConfig, type VoiceEvents };
+export { VoiceClient, type VoiceClientConfig };

package/dist/index.d.ts

@@ -16,6 +16,7 @@ declare class VoiceClient {
     private userId;
     private iceServers;
     private isConnectedFlag;
+    private targetUserId;
     constructor(config: VoiceClientConfig);
     on(event: string, callback: Function): void;
     private emit;
@@ -34,16 +35,5 @@ declare class VoiceClient {
     isMuted(): boolean;
     getUserId(): string;
 }
-interface VoiceEvents {
-    connected: () => void;
-    disconnected: () => void;
-    remoteStream: (stream: MediaStream) => void;
-    localStream: (stream: MediaStream) => void;
-    error: (error: Error) => void;
-    userJoined: (userId: string) => void;
-    userLeft: (userId: string) => void;
-    speaking: (userId: string) => void;
-    stoppedSpeaking: (userId: string) => void;
-}
 
-export { VoiceClient, type VoiceClientConfig, type VoiceEvents };
+export { VoiceClient, type VoiceClientConfig };

package/dist/index.js

@@ -33,6 +33,7 @@ var VoiceClient = class {
     this.remoteStream = null;
     this.eventHandlers = /* @__PURE__ */ new Map();
     this.isConnectedFlag = false;
+    this.targetUserId = null;
     this.signalingUrl = config.signalingUrl;
     this.roomId = config.roomId;
     this.userId = config.userId;
@@ -82,10 +83,6 @@ var VoiceClient = class {
     this.pc.ontrack = (event) => {
       this.remoteStream = event.streams[0];
       this.emit("remoteStream", this.remoteStream);
-      if (!this.isConnectedFlag) {
-        this.isConnectedFlag = true;
-        this.emit("connected");
-      }
     };
     this.pc.onicecandidate = (event) => {
       if (event.candidate) {
@@ -95,6 +92,14 @@ var VoiceClient = class {
         });
       }
     };
+    this.pc.onconnectionstatechange = () => {
+      if (this.pc?.connectionState === "connected") {
+        if (!this.isConnectedFlag) {
+          this.isConnectedFlag = true;
+          this.emit("connected");
+        }
+      }
+    };
   }
   initWebSocket() {
     const url = `${this.signalingUrl}?userId=${this.userId}&roomId=${this.roomId}`;
@@ -114,11 +119,13 @@ var VoiceClient = class {
     switch (message.type) {
       case "user-joined":
         if (message.userId !== this.userId) {
+          this.targetUserId = message.userId;
           await this.createOffer();
           this.emit("userJoined", message.userId);
         }
         break;
       case "offer":
+        this.targetUserId = message.userId;
         await this.handleOffer(message);
         break;
       case "answer":
@@ -155,8 +162,10 @@ var VoiceClient = class {
     await this.pc.setRemoteDescription(answer);
   }
   async handleCandidate(message) {
-    const candidate = new RTCIceCandidate(message.candidate);
-    await this.pc.addIceCandidate(candidate);
+    if (message.candidate) {
+      const candidate = new RTCIceCandidate(message.candidate);
+      await this.pc.addIceCandidate(candidate);
+    }
   }
   send(data) {
     if (this.ws?.readyState === WebSocket.OPEN) {
@@ -169,7 +178,9 @@ var VoiceClient = class {
       this.ws.close();
     }
     this.pc?.close();
-    this.localStream?.getTracks().forEach((track) => track.stop());
+    if (this.localStream) {
+      this.localStream.getTracks().forEach((track) => track.stop());
+    }
     this.isConnectedFlag = false;
     this.emit("disconnected");
   }

package/dist/index.mjs

@@ -7,6 +7,7 @@ var VoiceClient = class {
     this.remoteStream = null;
     this.eventHandlers = /* @__PURE__ */ new Map();
     this.isConnectedFlag = false;
+    this.targetUserId = null;
     this.signalingUrl = config.signalingUrl;
     this.roomId = config.roomId;
     this.userId = config.userId;
@@ -56,10 +57,6 @@ var VoiceClient = class {
     this.pc.ontrack = (event) => {
       this.remoteStream = event.streams[0];
       this.emit("remoteStream", this.remoteStream);
-      if (!this.isConnectedFlag) {
-        this.isConnectedFlag = true;
-        this.emit("connected");
-      }
     };
     this.pc.onicecandidate = (event) => {
       if (event.candidate) {
@@ -69,6 +66,14 @@ var VoiceClient = class {
         });
       }
     };
+    this.pc.onconnectionstatechange = () => {
+      if (this.pc?.connectionState === "connected") {
+        if (!this.isConnectedFlag) {
+          this.isConnectedFlag = true;
+          this.emit("connected");
+        }
+      }
+    };
   }
   initWebSocket() {
     const url = `${this.signalingUrl}?userId=${this.userId}&roomId=${this.roomId}`;
@@ -88,11 +93,13 @@ var VoiceClient = class {
     switch (message.type) {
       case "user-joined":
         if (message.userId !== this.userId) {
+          this.targetUserId = message.userId;
           await this.createOffer();
           this.emit("userJoined", message.userId);
         }
         break;
       case "offer":
+        this.targetUserId = message.userId;
         await this.handleOffer(message);
         break;
       case "answer":
@@ -129,8 +136,10 @@ var VoiceClient = class {
     await this.pc.setRemoteDescription(answer);
   }
   async handleCandidate(message) {
-    const candidate = new RTCIceCandidate(message.candidate);
-    await this.pc.addIceCandidate(candidate);
+    if (message.candidate) {
+      const candidate = new RTCIceCandidate(message.candidate);
+      await this.pc.addIceCandidate(candidate);
+    }
   }
   send(data) {
     if (this.ws?.readyState === WebSocket.OPEN) {
@@ -143,7 +152,9 @@ var VoiceClient = class {
       this.ws.close();
     }
     this.pc?.close();
-    this.localStream?.getTracks().forEach((track) => track.stop());
+    if (this.localStream) {
+      this.localStream.getTracks().forEach((track) => track.stop());
+    }
     this.isConnectedFlag = false;
     this.emit("disconnected");
   }

package/package.json

@@ -1,38 +1,37 @@
-{
-  "name": "@voicemaster/core",
-  "version": "1.0.5",
-  "description": "WebRTC voice communication core library",
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
-    }
-  },
-  "scripts": {
-    "build": "tsup src/index.ts --format cjs,esm --dts --clean",
-    "dev": "tsup src/index.ts --format cjs,esm --dts --watch",
-    "prepublishOnly": "npm run build"
-  },
-  "keywords": [
-    "webrtc",
-    "voice",
-    "audio",
-    "p2p",
-    "typescript"
-  ],
-  "author": "Sergey Minasyan",
-  "license": "MIT",
-  "dependencies": {
-    "@voicemaster/core": "^1.0.1",
-    "simple-peer": "^9.11.1"
-  },
-  "devDependencies": {
-    "@types/simple-peer": "^9.11.8",
-    "tsup": "^8.0.0",
-    "typescript": "^5.3.0"
-  }
-}
+{
+  "name": "@voicemaster/core",
+  "version": "1.0.7",
+  "description": "WebRTC voice communication core library",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.js"
+    }
+  },
+  "scripts": {
+    "build": "tsup src/index.ts --format cjs,esm --dts --clean",
+    "dev": "tsup src/index.ts --format cjs,esm --dts --watch",
+    "prepublishOnly": "npm run build"
+  },
+  "keywords": [
+    "webrtc",
+    "voice",
+    "audio",
+    "p2p",
+    "typescript"
+  ],
+  "author": "Sergey Minasyan",
+  "license": "MIT",
+  "dependencies": {
+    "simple-peer": "^9.11.1"
+  },
+  "devDependencies": {
+    "@types/simple-peer": "^9.11.8",
+    "tsup": "^8.0.0",
+    "typescript": "^5.3.0"
+  }
+}

package/src/VoiceClient.ts

@@ -1,210 +1,211 @@
-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;
-
-  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);
-      if (!this.isConnectedFlag) {
-        this.isConnectedFlag = true;
-        this.emit('connected');
-      }
-    };
-
-    this.pc.onicecandidate = (event) => {
-      if (event.candidate) {
-        this.send({
-          type: 'candidate',
-          candidate: event.candidate
-        });
-      }
-    };
-  }
-
-  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> {
-    switch (message.type) {
-      case 'user-joined':
-        if (message.userId !== this.userId) {
-          await this.createOffer();
-          this.emit('userJoined', message.userId);
-        }
-        break;
-      case 'offer':
-        await this.handleOffer(message);
-        break;
-      case 'answer':
-        await this.handleAnswer(message);
-        break;
-      case 'candidate':
-        await this.handleCandidate(message);
-        break;
-      case 'user-left':
-        this.emit('userLeft', message.userId);
-        break;
-    }
-  }
-
-  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> {
-    const offer = new RTCSessionDescription(message.sdp);
-    await this.pc!.setRemoteDescription(offer);
-    const answer = await this.pc!.createAnswer();
-    await this.pc!.setLocalDescription(answer);
-    this.send({
-      type: 'answer',
-      sdp: this.pc!.localDescription
-    });
-  }
-
-  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> {
-    const candidate = new RTCIceCandidate(message.candidate);
-    await this.pc!.addIceCandidate(candidate);
-  }
-
-  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();
-    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;
-  }
-}
-export interface VoiceEvents {
-  connected: () => void;
-  disconnected: () => void;
-  remoteStream: (stream: MediaStream) => void;
-  localStream: (stream: MediaStream) => void;
-  error: (error: Error) => void;
-  userJoined: (userId: string) => void;
-  userLeft: (userId: string) => void;
-  speaking: (userId: string) => void;
-  stoppedSpeaking: (userId: string) => void;
+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> {
+    switch (message.type) {
+      case 'user-joined':
+        if (message.userId !== this.userId) {
+          this.targetUserId = message.userId;
+          await this.createOffer();
+          this.emit('userJoined', message.userId);
+        }
+        break;
+      case 'offer':
+        this.targetUserId = message.userId;
+        await this.handleOffer(message);
+        break;
+      case 'answer':
+        await this.handleAnswer(message);
+        break;
+      case 'candidate':
+        await this.handleCandidate(message);
+        break;
+      case 'user-left':
+        this.emit('userLeft', message.userId);
+        break;
+    }
+  }
+
+  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> {
+    const offer = new RTCSessionDescription(message.sdp);
+    await this.pc!.setRemoteDescription(offer);
+    const answer = await this.pc!.createAnswer();
+    await this.pc!.setLocalDescription(answer);
+    this.send({
+      type: 'answer',
+      sdp: this.pc!.localDescription
+    });
+  }
+
+  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> {
+    if (message.candidate) {
+      const candidate = new RTCIceCandidate(message.candidate);
+      await this.pc!.addIceCandidate(candidate);
+    }
+  }
+
+  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 +1,2 @@
-export { VoiceClient } from './VoiceClient';
-export type { VoiceClientConfig, VoiceEvents } from './VoiceClient';
+export { VoiceClient } from './VoiceClient';
+export type { VoiceClientConfig } from './VoiceClient';

package/tsconfig.json

@@ -1,16 +1,16 @@
-{
-  "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"]
+{
+  "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"]
 }