rubjs 2.7.3 → 2.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rubjs",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "main": "rubjs/index.js",
   "types": "rubjs/index.d.ts",
   "keywords": [

package/rubjs/utils/VoiceChatClient.d.ts

@@ -14,6 +14,7 @@ declare class VoiceChatClient {
     private isPaused;
     private lastPosition;
     private intervalId?;
+    private isManualSkip;
     constructor();
     play(filePath?: string): Promise<void>;
     stop(): void;
@@ -21,6 +22,7 @@ declare class VoiceChatClient {
     next(): void;
     previous(): void;
     addToPlaylist(filePath: string): void;
+    removeFromPlaylist(filePath: string): void;
     joinVoiceChat(chatGuid: string, voiceChatId: string, client: Client): Promise<void>;
     private clearIntervals;
 }

package/rubjs/utils/VoiceChatClient.js

@@ -19,6 +19,7 @@ class VoiceChatClient {
         this.currentIndex = 0;
         this.isPaused = false;
         this.lastPosition = 0;
+        this.isManualSkip = false;
         this.pc = new wrtc_1.RTCPeerConnection();
         this.source = new wrtc_1.nonstandard.RTCAudioSource();
         this.track = this.source.createTrack();
@@ -37,18 +38,28 @@ class VoiceChatClient {
                 throw new Error("Voice chat not initialized. Call `joinVoiceChat` first.");
             }
             this.isPaused = false;
+            this.isManualSkip = false;
             this.buffer = Buffer.alloc(0);
             const seekArgs = this.lastPosition > 0 ? ["-ss", this.lastPosition.toString()] : [];
             this.ffmpeg = (0, child_process_1.spawn)("ffmpeg", [
-                "-loglevel", "quiet",
+                "-loglevel",
+                "quiet",
                 "-re",
-                "-threads", "1", // کاهش مصرف رم و پردازش
+                "-threads",
+                "1",
+                "-protocol_whitelist",
+                "file,http,https,tcp,tls",
                 ...seekArgs,
-                "-i", filePath,
-                "-acodec", "pcm_s16le",
-                "-ar", "48000",
-                "-ac", "1",
-                "-f", "s16le",
+                "-i",
+                filePath,
+                "-acodec",
+                "pcm_s16le",
+                "-ar",
+                "48000",
+                "-ac",
+                "1",
+                "-f",
+                "s16le",
                 "pipe:1",
             ]);
             this.ffmpeg.stdout.on("data", (chunk) => {
@@ -64,8 +75,12 @@ class VoiceChatClient {
                     this.lastPosition += 0.02;
                 }
             });
-            this.ffmpeg.on("close", () => this.next());
-            this.ffmpeg.on("exit", () => this.next());
+            this.ffmpeg.on("close", (code) => {
+                if (!this.isManualSkip && code !== null && !this.isPaused) {
+                    this.next();
+                }
+                this.isManualSkip = false;
+            });
         });
     }
     stop() {
@@ -73,7 +88,7 @@ class VoiceChatClient {
             this.ffmpeg.kill();
             this.ffmpeg = undefined;
             this.isPaused = true;
-            this.buffer = Buffer.alloc(0); // پاک کردن بافر برای کاهش مصرف رم
+            this.buffer = Buffer.alloc(0);
         }
     }
     resume() {
@@ -82,21 +97,36 @@ class VoiceChatClient {
     }
     next() {
         if (this.playlist.length > this.currentIndex + 1) {
-            this.currentIndex++;
+            this.isManualSkip = true;
+            this.stop();
+            this.currentIndex += 1;
             this.lastPosition = 0;
-            this.play();
+            this.isPaused = true;
+            this.play(this.playlist[this.currentIndex]);
         }
     }
     previous() {
         if (this.currentIndex > 0) {
+            this.isManualSkip = true;
+            this.stop();
             this.currentIndex--;
             this.lastPosition = 0;
+            this.isPaused = true;
             this.play();
         }
     }
     addToPlaylist(filePath) {
         this.playlist.push(filePath);
     }
+    removeFromPlaylist(filePath) {
+        const index = this.playlist.indexOf(filePath);
+        if (index !== -1) {
+            this.playlist.splice(index, 1);
+            if (index <= this.currentIndex && this.currentIndex > 0) {
+                this.currentIndex--;
+            }
+        }
+    }
     joinVoiceChat(chatGuid, voiceChatId, client) {
         return __awaiter(this, void 0, void 0, function* () {
             this.chatGuid = chatGuid;