rubjs 2.7.3 → 2.7.5

package/package.json

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

package/rubjs/utils/VoiceChatClient.d.ts

@@ -14,13 +14,16 @@ declare class VoiceChatClient {
     private isPaused;
     private lastPosition;
     private intervalId?;
-    constructor();
+    private isManualSkip;
+    private getAnyMusicCallback;
+    constructor(getAnyMusicCallback?: () => Promise<string>);
     play(filePath?: string): Promise<void>;
     stop(): void;
     resume(): void;
-    next(): void;
+    next(): Promise<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

@@ -12,43 +12,60 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const child_process_1 = require("child_process");
 const wrtc_1 = require("wrtc");
 class VoiceChatClient {
-    constructor() {
+    constructor(getAnyMusicCallback) {
         this.buffer = Buffer.alloc(0);
         this.frameSize = 960;
         this.playlist = [];
         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();
         this.pc.addTrack(this.track);
+        this.getAnyMusicCallback = getAnyMusicCallback;
     }
     play(filePath) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.ffmpeg)
                 this.stop();
             if (!filePath) {
-                if (this.playlist.length === 0)
-                    return;
+                if (this.playlist.length === 0) {
+                    if (this.getAnyMusicCallback) {
+                        this.playlist = [yield this.getAnyMusicCallback()];
+                    }
+                    else
+                        return;
+                }
                 filePath = this.playlist[this.currentIndex];
             }
             if (!this.chatGuid || !this.voiceChatId || !this.client) {
                 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 +81,27 @@ class VoiceChatClient {
                     this.lastPosition += 0.02;
                 }
             });
-            this.ffmpeg.on("close", () => this.next());
-            this.ffmpeg.on("exit", () => this.next());
+            this.ffmpeg.on("close", (code) => __awaiter(this, void 0, void 0, function* () {
+                if (!this.isManualSkip && code !== null && !this.isPaused) {
+                    yield this.next();
+                }
+                this.isManualSkip = false;
+            }));
+            this.clearIntervals();
+            this.intervalId = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    yield this.client.getGroupVoiceChatUpdates(this.chatGuid, this.voiceChatId);
+                }
+                catch (_a) { }
+            }), 10 * 1000);
+            this.intervalId = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (this.isPaused)
+                        return;
+                    yield this.client.sendVoiceChatActivity(this.chatGuid, this.voiceChatId, this.client.userGuid);
+                }
+                catch (_a) { }
+            }), 2 * 1000);
         });
     }
     stop() {
@@ -73,7 +109,7 @@ class VoiceChatClient {
             this.ffmpeg.kill();
             this.ffmpeg = undefined;
             this.isPaused = true;
-            this.buffer = Buffer.alloc(0); // پاک کردن بافر برای کاهش مصرف رم
+            this.buffer = Buffer.alloc(0);
         }
     }
     resume() {
@@ -81,22 +117,45 @@ class VoiceChatClient {
             this.play();
     }
     next() {
-        if (this.playlist.length > this.currentIndex + 1) {
-            this.currentIndex++;
-            this.lastPosition = 0;
-            this.play();
-        }
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.playlist.length > this.currentIndex + 1) {
+                this.isManualSkip = true;
+                this.stop();
+                this.currentIndex += 1;
+                this.lastPosition = 0;
+                this.isPaused = true;
+                this.play(this.playlist[this.currentIndex]);
+            }
+            else {
+                if (this.getAnyMusicCallback) {
+                    this.playlist = [...this.playlist, yield this.getAnyMusicCallback()];
+                    yield this.next();
+                }
+            }
+        });
     }
     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;
@@ -108,19 +167,6 @@ class VoiceChatClient {
             const sdpAnswer = connect.sdp_answer_data;
             yield this.pc.setRemoteDescription(new wrtc_1.RTCSessionDescription({ type: "answer", sdp: sdpAnswer }));
             yield client.setVoiceChatState(chatGuid, voiceChatId);
-            this.clearIntervals();
-            this.intervalId = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    yield client.getGroupVoiceChatUpdates(chatGuid, voiceChatId);
-                }
-                catch (_a) { }
-            }), 10 * 1000);
-            this.intervalId = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    yield client.sendVoiceChatActivity(chatGuid, voiceChatId, client.userGuid);
-                }
-                catch (_a) { }
-            }), 2 * 1000);
         });
     }
     clearIntervals() {