rubjs 2.7.4 → 2.7.5

package/package.json

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

package/rubjs/utils/VoiceChatClient.d.ts

@@ -15,11 +15,12 @@ declare class VoiceChatClient {
     private lastPosition;
     private intervalId?;
     private isManualSkip;
-    constructor();
+    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;

package/rubjs/utils/VoiceChatClient.js

@@ -12,7 +12,7 @@ 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 = [];
@@ -24,14 +24,20 @@ class VoiceChatClient {
         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) {
@@ -75,12 +81,27 @@ class VoiceChatClient {
                     this.lastPosition += 0.02;
                 }
             });
-            this.ffmpeg.on("close", (code) => {
+            this.ffmpeg.on("close", (code) => __awaiter(this, void 0, void 0, function* () {
                 if (!this.isManualSkip && code !== null && !this.isPaused) {
-                    this.next();
+                    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() {
@@ -96,14 +117,22 @@ class VoiceChatClient {
             this.play();
     }
     next() {
-        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]);
-        }
+        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) {
@@ -138,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() {