v0.1.0 strict mode on voice

voice/README.md

@@ -4,4 +4,4 @@ Voice clients for browser and node.
 
 [![npm](https://img.shields.io/npm/dt/@revkit/voice?label=Downloads&style=flat-square&color=ff4654)](https://www.npmjs.com/package/@revkit/voice)
 
-Unfinished voice module.
+Almost finished voice module.

voice/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@revkit/voice",
-  "version": "0.0.8",
-  "description": "Voice support for browser/node using revkit-based clients.",
+  "version": "0.1.0",
+  "description": "Voice library for Revolt that works in the browser and node.js!",
   "main": "dist/cjs/index.js",
   "module": "dist/es6/index.js",
   "types": "dist/es6/index.d.ts",

voice/src/Signaling.ts

@@ -67,7 +67,7 @@ export default class Signaling<Platform extends MSCPlatform> extends EventEmitte
 
   /** Disconnects the websocket. */
   disconnect() {
-    if (this.connected) this.ws.close(1000);
+    if (this.connected) this.ws?.close(1000);
   }
 
   private parseData(event: WebSocket.MessageEvent) {

voice/src/VoiceClient.ts

@@ -66,7 +66,7 @@ export class VoiceClient<
   public client = new Client();
   public channelID: string | null = null;
   public get channel() {
-    return this.client.channels.get(this.channelID);
+    return this.channelID ? this.client.channels.get(this.channelID) : undefined;
   }
 
   /**
@@ -117,17 +117,8 @@ export class VoiceClient<
           }
           case WSEvents.UserStartProduce: {
             const participant = this.participants.get(data.id);
-            if (!participant || participant.user.id == this.client.user.id) return;
-            if (<any>data.type in participant) {
-              participant[data.type] = true;
-            } else {
-              return this.emit(
-                "error",
-                new Error(
-                  `Invalid produce type ${data.type} for ${participant.user.username} (${participant.user.id})`
-                )
-              );
-            }
+            if (!participant || participant.user.id == this.client.user.id || !data.type) return;
+            if (data.type in participant) participant[data.type] = true;
             this.participants.fireUpdate([participant]);
 
             if (this.recvTransport) await this.startConsume(data.id, data.type);
@@ -136,17 +127,8 @@ export class VoiceClient<
           }
           case WSEvents.UserStopProduce: {
             const participant = this.participants.get(data.id);
-            if (!participant) return;
-            if (<any>data.type in participant) {
-              participant[data.type] = false;
-            } else {
-              return this.emit(
-                "error",
-                new Error(
-                  `Invalid produce type ${data.type} for ${participant.user.username} (${participant.user.id})`
-                )
-              );
-            }
+            if (!participant || !data.type) return;
+            if (data.type in participant) participant[data.type] = false;
             this.participants.fireUpdate([participant]);
 
             if (this.recvTransport) this.stopConsume(data.id, data.type);
@@ -210,8 +192,8 @@ export class VoiceClient<
 
     if (this.sendTransport) this.sendTransport.close();
     if (this.recvTransport) this.recvTransport.close();
-    this.sendTransport = undefined;
-    this.recvTransport = undefined;
+    this.sendTransport = null;
+    this.recvTransport = null;
 
     this.emit("close", error);
   }
@@ -354,7 +336,7 @@ export class VoiceClient<
   }
 
   public async stopProduce(type: ProduceType) {
-    let producer: MSC["Producer"];
+    let producer: MSC["Producer"] | undefined;
     switch (type) {
       case "audio":
         producer = this.audioProducer;
@@ -376,7 +358,7 @@ export class VoiceClient<
 
     try {
       await this.signaling.stopProduce(type);
-    } catch (error) {
+    } catch (error: any) {
       if (error.error === "ProducerNotFound") return;
       this.emit("error", error);
     }
@@ -428,7 +410,7 @@ export class VoiceClient<
       this.setStatus(VoiceStatus.RTC_CONNECTING);
       await this.initializeTransports();
     } catch (err) {
-      this.emit("error", err);
+      this.emit("error", err instanceof Error ? err : new Error(String(err)));
       this.setStatus(VoiceStatus.READY);
       return this;
     }
@@ -452,6 +434,7 @@ export class VoiceClient<
     }
   }
 
+  /** Deafens yourself and stops consuming audio from participants. */
   public async startDeafen() {
     if (this.deafened) return;
     this._deafened = true;
@@ -460,6 +443,7 @@ export class VoiceClient<
     });
     this.emit("selfDeafenUpdate", true);
   }
+  /** Undeafens yourself and restarts consuming audio from participants. */
   public async stopDeafen() {
     if (!this.deafened) return;
     this._deafened = false;

voice/src/browser.ts

@@ -13,6 +13,7 @@ export const DEFAULT_CONSUMER: VoiceClientConsumer<"browser"> = (type, track) =>
     audio.play();
     return () => audio.pause();
   }
+  return () => {};
 };
 
 /**

voice/src/node.ts

@@ -81,9 +81,9 @@ export default class VoiceClient extends BaseVoiceClient<"node"> {
     this.port = await MSC.findPort(PORT_MIN, Math.floor(PORT_MAX / 2), "udp4");
   }
 
-  private transcoder: FFmpeg;
-  private volumeTransformer: VolumeTransformer;
-  private encoder: FFmpeg;
+  private transcoder?: FFmpeg;
+  private volumeTransformer?: VolumeTransformer;
+  private encoder?: FFmpeg;
 
   /** Current volume of the player. */
   public get volume() {
@@ -135,7 +135,7 @@ export default class VoiceClient extends BaseVoiceClient<"node"> {
         if ((<any>err).code == "EPIPE") return;
         this.emit("error", err);
       });
-      this.transcoder.process.stderr.on("data", () => {});
+      this.transcoder.process.stderr?.on("data", () => {});
     } else delete this.transcoder;
     if (this.volumeTransformer) this.volumeTransformer.destroy();
     if (respawn) {
@@ -173,13 +173,17 @@ export default class VoiceClient extends BaseVoiceClient<"node"> {
         this.emit("error", err);
       });
       // fixes stream stopping after 4min
-      this.encoder.process.stderr.on("data", () => {});
+      this.encoder.process.stderr?.on("data", () => {});
     } else delete this.encoder;
   }
 
   public async play(type: ProduceType, stream: Readable) {
     await this.resetPort();
     this.reset();
+
+    if (!this.transcoder || !this.volumeTransformer || !this.encoder)
+      throw new Error("Transcoders failed to start.");
+
     switch (type) {
       case "audio": {
         // create track sent to vortex
@@ -255,17 +259,17 @@ a=rtpmap:${RTP_PAYLOAD_TYPE} opus/${this.options.sampleRate}/${this.options.audi
       this.emit("error", err);
     });
 
-    const track = producer[type].consumer.track;
+    const track = producer[type]?.consumer.track;
     if (!track) return null;
-    if (track.onReceiveRtp.ended) return; // if the user unmuted and muted too quickly
+    if (track.onReceiveRtp.ended) return null; // if the user unmuted and muted too quickly
 
     track.onReceiveRtp.subscribe((packet) => {
       // if the decoder is destroyed, stop sending packets to it
       if (decoder.destroyed) return cancel(participant, type);
       try {
         socket.send(packet.serialize(), port, "127.0.0.1");
       } catch (err) {
-        this.emit("error", err);
+        this.emit("error", err instanceof Error ? err : new Error(String(err)));
       }
     });
 

voice/tsconfig.cjs.json

@@ -6,7 +6,8 @@
     "outDir": "dist/cjs",
     "esModuleInterop": true,
     "declaration": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "strict": true
   },
   "include": ["src"]
 }

voice/tsconfig.json

@@ -7,7 +7,8 @@
     "esModuleInterop": true,
     "declaration": true,
     "skipLibCheck": true,
-    "moduleResolution": "Node"
+    "moduleResolution": "Node",
+    "strict": true
   },
   "include": ["src"]
 }