@voicemaster/core 1.0.3 → 1.0.5

package/dist/index.d.mts

@@ -7,7 +7,7 @@ interface VoiceClientConfig {
 }
 declare class VoiceClient {
     private ws;
-    private peer;
+    private pc;
     private localStream;
     private remoteStream;
     private eventHandlers;
@@ -21,10 +21,13 @@ declare class VoiceClient {
     private emit;
     connect(): Promise<void>;
     private initMicrophone;
+    private initPeerConnection;
     private initWebSocket;
     private handleSignalingMessage;
-    private initPeer;
-    private handlePeerSignal;
+    private createOffer;
+    private handleOffer;
+    private handleAnswer;
+    private handleCandidate;
     private send;
     disconnect(): void;
     toggleMute(): void;

package/dist/index.d.ts

@@ -7,7 +7,7 @@ interface VoiceClientConfig {
 }
 declare class VoiceClient {
     private ws;
-    private peer;
+    private pc;
     private localStream;
     private remoteStream;
     private eventHandlers;
@@ -21,10 +21,13 @@ declare class VoiceClient {
     private emit;
     connect(): Promise<void>;
     private initMicrophone;
+    private initPeerConnection;
     private initWebSocket;
     private handleSignalingMessage;
-    private initPeer;
-    private handlePeerSignal;
+    private createOffer;
+    private handleOffer;
+    private handleAnswer;
+    private handleCandidate;
     private send;
     disconnect(): void;
     toggleMute(): void;

package/dist/index.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -35,11 +25,10 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/VoiceClient.ts
-var import_simple_peer = __toESM(require("simple-peer"));
 var VoiceClient = class {
   constructor(config) {
     this.ws = null;
-    this.peer = null;
+    this.pc = null;
     this.localStream = null;
     this.remoteStream = null;
     this.eventHandlers = /* @__PURE__ */ new Map();
@@ -69,6 +58,7 @@ var VoiceClient = class {
   async connect() {
     try {
       await this.initMicrophone();
+      this.initPeerConnection();
       this.initWebSocket();
     } catch (error) {
       this.emit("error", error);
@@ -84,75 +74,89 @@ var VoiceClient = class {
     });
     this.emit("localStream", this.localStream);
   }
+  initPeerConnection() {
+    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
+        });
+      }
+    };
+  }
   initWebSocket() {
     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 = (event) => {
+    this.ws.onmessage = async (event) => {
       const message = JSON.parse(event.data);
-      this.handleSignalingMessage(message);
+      await this.handleSignalingMessage(message);
     };
     this.ws.onclose = () => {
       this.emit("disconnected");
     };
   }
-  handleSignalingMessage(message) {
+  async handleSignalingMessage(message) {
     switch (message.type) {
       case "user-joined":
         if (message.userId !== this.userId) {
-          this.initPeer(true);
+          await this.createOffer();
           this.emit("userJoined", message.userId);
         }
         break;
-      case "signal":
-        this.handlePeerSignal(message.userId, message.payload);
+      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;
     }
   }
-  initPeer(initiator) {
-    if (this.peer) return;
-    this.peer = new import_simple_peer.default({
-      initiator,
-      trickle: true,
-      stream: this.localStream || void 0,
-      config: { iceServers: this.iceServers }
+  async createOffer() {
+    const offer = await this.pc.createOffer();
+    await this.pc.setLocalDescription(offer);
+    this.send({
+      type: "offer",
+      sdp: this.pc.localDescription
     });
-    this.peer.on("signal", (data) => {
-      this.send({
-        type: "signal",
-        userId: this.userId,
-        roomId: this.roomId,
-        payload: data
-      });
-    });
-    this.peer.on("stream", (stream) => {
-      this.remoteStream = stream;
-      this.emit("remoteStream", stream);
-      if (!this.isConnectedFlag) {
-        this.isConnectedFlag = true;
-        this.emit("connected");
-      }
-    });
-    this.peer.on("connect", () => {
-      if (!this.isConnectedFlag) {
-        this.isConnectedFlag = true;
-        this.emit("connected");
-      }
-    });
-    this.peer.on("error", (err) => {
-      console.error("Peer error:", err);
+  }
+  async handleOffer(message) {
+    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
     });
   }
-  handlePeerSignal(targetUserId, signal) {
-    if (!this.peer) {
-      this.initPeer(false);
-    }
-    this.peer?.signal(signal);
+  async handleAnswer(message) {
+    const answer = new RTCSessionDescription(message.sdp);
+    await this.pc.setRemoteDescription(answer);
+  }
+  async handleCandidate(message) {
+    const candidate = new RTCIceCandidate(message.candidate);
+    await this.pc.addIceCandidate(candidate);
   }
   send(data) {
     if (this.ws?.readyState === WebSocket.OPEN) {
@@ -164,10 +168,8 @@ var VoiceClient = class {
       this.send({ type: "leave", roomId: this.roomId, userId: this.userId });
       this.ws.close();
     }
-    this.peer?.destroy();
-    if (this.localStream) {
-      this.localStream.getTracks().forEach((track) => track.stop());
-    }
+    this.pc?.close();
+    this.localStream?.getTracks().forEach((track) => track.stop());
     this.isConnectedFlag = false;
     this.emit("disconnected");
   }

package/dist/index.mjs

@@ -1,9 +1,8 @@
 // src/VoiceClient.ts
-import Peer from "simple-peer";
 var VoiceClient = class {
   constructor(config) {
     this.ws = null;
-    this.peer = null;
+    this.pc = null;
     this.localStream = null;
     this.remoteStream = null;
     this.eventHandlers = /* @__PURE__ */ new Map();
@@ -33,6 +32,7 @@ var VoiceClient = class {
   async connect() {
     try {
       await this.initMicrophone();
+      this.initPeerConnection();
       this.initWebSocket();
     } catch (error) {
       this.emit("error", error);
@@ -48,75 +48,89 @@ var VoiceClient = class {
     });
     this.emit("localStream", this.localStream);
   }
+  initPeerConnection() {
+    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
+        });
+      }
+    };
+  }
   initWebSocket() {
     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 = (event) => {
+    this.ws.onmessage = async (event) => {
       const message = JSON.parse(event.data);
-      this.handleSignalingMessage(message);
+      await this.handleSignalingMessage(message);
     };
     this.ws.onclose = () => {
       this.emit("disconnected");
     };
   }
-  handleSignalingMessage(message) {
+  async handleSignalingMessage(message) {
     switch (message.type) {
       case "user-joined":
         if (message.userId !== this.userId) {
-          this.initPeer(true);
+          await this.createOffer();
           this.emit("userJoined", message.userId);
         }
         break;
-      case "signal":
-        this.handlePeerSignal(message.userId, message.payload);
+      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;
     }
   }
-  initPeer(initiator) {
-    if (this.peer) return;
-    this.peer = new Peer({
-      initiator,
-      trickle: true,
-      stream: this.localStream || void 0,
-      config: { iceServers: this.iceServers }
+  async createOffer() {
+    const offer = await this.pc.createOffer();
+    await this.pc.setLocalDescription(offer);
+    this.send({
+      type: "offer",
+      sdp: this.pc.localDescription
     });
-    this.peer.on("signal", (data) => {
-      this.send({
-        type: "signal",
-        userId: this.userId,
-        roomId: this.roomId,
-        payload: data
-      });
-    });
-    this.peer.on("stream", (stream) => {
-      this.remoteStream = stream;
-      this.emit("remoteStream", stream);
-      if (!this.isConnectedFlag) {
-        this.isConnectedFlag = true;
-        this.emit("connected");
-      }
-    });
-    this.peer.on("connect", () => {
-      if (!this.isConnectedFlag) {
-        this.isConnectedFlag = true;
-        this.emit("connected");
-      }
-    });
-    this.peer.on("error", (err) => {
-      console.error("Peer error:", err);
+  }
+  async handleOffer(message) {
+    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
     });
   }
-  handlePeerSignal(targetUserId, signal) {
-    if (!this.peer) {
-      this.initPeer(false);
-    }
-    this.peer?.signal(signal);
+  async handleAnswer(message) {
+    const answer = new RTCSessionDescription(message.sdp);
+    await this.pc.setRemoteDescription(answer);
+  }
+  async handleCandidate(message) {
+    const candidate = new RTCIceCandidate(message.candidate);
+    await this.pc.addIceCandidate(candidate);
   }
   send(data) {
     if (this.ws?.readyState === WebSocket.OPEN) {
@@ -128,10 +142,8 @@ var VoiceClient = class {
       this.send({ type: "leave", roomId: this.roomId, userId: this.userId });
       this.ws.close();
     }
-    this.peer?.destroy();
-    if (this.localStream) {
-      this.localStream.getTracks().forEach((track) => track.stop());
-    }
+    this.pc?.close();
+    this.localStream?.getTracks().forEach((track) => track.stop());
     this.isConnectedFlag = false;
     this.emit("disconnected");
   }

package/package.json

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

package/src/VoiceClient.ts

@@ -1,5 +1,3 @@
-import Peer from 'simple-peer';
-
 export interface VoiceClientConfig {
   signalingUrl: string;
   roomId: string;
@@ -10,7 +8,7 @@ export interface VoiceClientConfig {
 
 export class VoiceClient {
   private ws: WebSocket | null = null;
-  private peer: Peer.Instance | null = null;
+  private pc: RTCPeerConnection | null = null;
   private localStream: MediaStream | null = null;
   private remoteStream: MediaStream | null = null;
   private eventHandlers: Map<string, Function[]> = new Map();
@@ -50,6 +48,7 @@ export class VoiceClient {
   async connect(): Promise<void> {
     try {
       await this.initMicrophone();
+      this.initPeerConnection();
       this.initWebSocket();
     } catch (error) {
       this.emit('error', error);
@@ -67,6 +66,32 @@ export class VoiceClient {
     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);
@@ -75,9 +100,9 @@ export class VoiceClient {
       this.send({ type: 'join', roomId: this.roomId, userId: this.userId });
     };
 
-    this.ws.onmessage = (event) => {
+    this.ws.onmessage = async (event) => {
       const message = JSON.parse(event.data);
-      this.handleSignalingMessage(message);
+      await this.handleSignalingMessage(message);
     };
 
     this.ws.onclose = () => {
@@ -85,16 +110,22 @@ export class VoiceClient {
     };
   }
 
-  private handleSignalingMessage(message: any): void {
+  private async handleSignalingMessage(message: any): Promise<void> {
     switch (message.type) {
       case 'user-joined':
         if (message.userId !== this.userId) {
-          this.initPeer(true);
+          await this.createOffer();
           this.emit('userJoined', message.userId);
         }
         break;
-      case 'signal':
-        this.handlePeerSignal(message.userId, message.payload);
+      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);
@@ -102,52 +133,34 @@ export class VoiceClient {
     }
   }
 
-  private initPeer(initiator: boolean): void {
-    if (this.peer) return;
-
-    this.peer = new Peer({
-      initiator,
-      trickle: true,
-      stream: this.localStream || undefined,
-      config: { iceServers: this.iceServers }
-    });
-
-    this.peer.on('signal', (data) => {
-      this.send({
-        type: 'signal',
-        userId: this.userId,
-        roomId: this.roomId,
-        payload: data
-      });
-    });
-
-    this.peer.on('stream', (stream) => {
-      this.remoteStream = stream;
-      this.emit('remoteStream', stream);
-      // Когда получили удалённый поток — значит соединение установлено
-      if (!this.isConnectedFlag) {
-        this.isConnectedFlag = true;
-        this.emit('connected');
-      }
+  private async createOffer(): Promise<void> {
+    const offer = await this.pc!.createOffer();
+    await this.pc!.setLocalDescription(offer);
+    this.send({
+      type: 'offer',
+      sdp: this.pc!.localDescription
     });
+  }
 
-    this.peer.on('connect', () => {
-      if (!this.isConnectedFlag) {
-        this.isConnectedFlag = true;
-        this.emit('connected');
-      }
+  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
     });
+  }
 
-    this.peer.on('error', (err) => {
-      console.error('Peer error:', err);
-    });
+  private async handleAnswer(message: any): Promise<void> {
+    const answer = new RTCSessionDescription(message.sdp);
+    await this.pc!.setRemoteDescription(answer);
   }
 
-  private handlePeerSignal(targetUserId: string, signal: any): void {
-    if (!this.peer) {
-      this.initPeer(false);
-    }
-    this.peer?.signal(signal);
+  private async handleCandidate(message: any): Promise<void> {
+    const candidate = new RTCIceCandidate(message.candidate);
+    await this.pc!.addIceCandidate(candidate);
   }
 
   private send(data: any): void {
@@ -161,10 +174,8 @@ export class VoiceClient {
       this.send({ type: 'leave', roomId: this.roomId, userId: this.userId });
       this.ws.close();
     }
-    this.peer?.destroy();
-    if (this.localStream) {
-      this.localStream.getTracks().forEach(track => track.stop());
-    }
+    this.pc?.close();
+    this.localStream?.getTracks().forEach(track => track.stop());
     this.isConnectedFlag = false;
     this.emit('disconnected');
   }
@@ -186,7 +197,6 @@ export class VoiceClient {
     return this.userId;
   }
 }
-
 export interface VoiceEvents {
   connected: () => void;
   disconnected: () => void;