rubjs 2.7.6 → 2.7.8

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "rubjs",
-  "version": "2.7.6",
+  "version": "2.7.8",
   "main": "rubjs/index.js",
   "types": "rubjs/index.d.ts",
   "keywords": [
     "javascript",
     "Rubika",
-    "library"
+    "library",
+    "rubjs"
   ],
   "module": "rubjs/index.js",
   "exports": {
@@ -25,12 +26,9 @@
   "dependencies": {
     "axios": "^1.7.9",
     "better-sqlite3": "^11.8.1",
-    "fluent-ffmpeg": "^2.1.3",
     "input": "^1.0.1",
-    "music-metadata": "^10.9.0",
     "node-rsa": "^1.1.1",
-    "sharp": "^0.33.5",
-    "wrtc": "^0.4.7",
+    "optional-require": "^1.1.8",
     "ws": "^8.18.0"
   },
   "devDependencies": {
@@ -43,4 +41,4 @@
     "rubjs/",
     "README.md"
   ]
-}
+}

package/rubjs/index.d.ts

@@ -1,6 +1,6 @@
 import Client from "./client";
 import Crypto from "./crypto";
 import * as Types from "./types";
-import { Filters, Utils, VoiceChatClient } from "./utils";
+import { Filters, Utils, VoiceChatClient, SendLiveClient } from "./utils";
 export default Client;
-export { Client, Crypto, Utils, VoiceChatClient, Filters, Types };
+export { Client, Crypto, Utils, VoiceChatClient, Filters, Types, SendLiveClient, };

package/rubjs/index.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Types = exports.Filters = exports.VoiceChatClient = exports.Utils = exports.Crypto = exports.Client = void 0;
+exports.SendLiveClient = exports.Types = exports.Filters = exports.VoiceChatClient = exports.Utils = exports.Crypto = exports.Client = void 0;
 const client_1 = __importDefault(require("./client"));
 exports.Client = client_1.default;
 const crypto_1 = __importDefault(require("./crypto"));
@@ -47,4 +47,5 @@ const utils_1 = require("./utils");
 Object.defineProperty(exports, "Filters", { enumerable: true, get: function () { return utils_1.Filters; } });
 Object.defineProperty(exports, "Utils", { enumerable: true, get: function () { return utils_1.Utils; } });
 Object.defineProperty(exports, "VoiceChatClient", { enumerable: true, get: function () { return utils_1.VoiceChatClient; } });
+Object.defineProperty(exports, "SendLiveClient", { enumerable: true, get: function () { return utils_1.SendLiveClient; } });
 exports.default = client_1.default;

package/rubjs/methods/chats/sendLive.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const thumbnail_1 = __importDefault(require("../utilities/thumbnail"));
 function sendLive(title_1, object_guid_1, image_1) {
     return __awaiter(this, arguments, void 0, function* (title, object_guid, image, device_type = "Software") {
-        const thumb_inline = yield thumbnail_1.default.fromImage(image);
+        const thumb_inline = yield thumbnail_1.default.fromVideo(image);
         return yield this.builder("sendLive", {
             thumb_inline,
             device_type,

package/rubjs/methods/messages/sendLive.d.ts

@@ -0,0 +1,3 @@
+import Client from "../..";
+declare function sendLive(this: Client, object_guid: string, music: string | Buffer<ArrayBufferLike>, caption?: string, reply_to_message_id?: string, is_spoil?: boolean, audio_info?: boolean, auto_delete?: number): Promise<import("../../types/messages").SendMessageResult>;
+export default sendLive;

package/rubjs/methods/messages/sendLive.js

@@ -0,0 +1,17 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+function sendLive(object_guid, music, caption, reply_to_message_id, is_spoil, audio_info, auto_delete) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return yield this.sendMessage(object_guid, caption, reply_to_message_id, music, "Music", is_spoil, null, audio_info, auto_delete);
+    });
+}
+exports.default = sendLive;

package/rubjs/methods/messages/sendMessage.js

@@ -46,9 +46,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = __importStar(require("fs"));
-const music_metadata_1 = require("music-metadata");
+const optional_require_1 = require("optional-require");
 const utilities_1 = require("../utilities");
 const parser_1 = __importDefault(require("../../parser"));
+const optionalMusicMetadata = (0, optional_require_1.optionalRequire)("music-metadata");
 function sendMessage(object_guid_1) {
     return __awaiter(this, arguments, void 0, function* (object_guid, text = null, reply_to_message_id = null, file_inline = null, type = "File", is_spoil = false, thumb = true, audio_info = false, auto_delete) {
         if (["me", "cloud", "self"].includes(object_guid.toLowerCase())) {
@@ -91,7 +92,10 @@ function sendMessage(object_guid_1) {
             if (["Music", "Voice"].includes(type)) {
                 thumb = false;
                 if (audio_info) {
-                    audio_data = yield (0, music_metadata_1.parseBuffer)(file_inline);
+                    if (!optionalMusicMetadata) {
+                        throw new Error("music-metadata module is not installed. Some features may be disabled.");
+                    }
+                    audio_data = yield optionalMusicMetadata.parseBuffer(file_inline);
                     duration = audio_data.format.duration || 5000;
                 }
             }

package/rubjs/methods/utilities/thumbnail.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -45,22 +12,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fluent_ffmpeg_1 = __importDefault(require("fluent-ffmpeg"));
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
-let sharp;
-try {
-    sharp = Promise.resolve().then(() => __importStar(require("sharp")));
-}
-catch (err) {
-    console.log("⚠️  Sharp module could not be loaded:", err.message);
-}
+const optional_require_1 = require("optional-require");
+const sharp = (0, optional_require_1.optionalRequire)("sharp", { default: true });
+const ffmpeg = (0, optional_require_1.optionalRequire)("fluent-ffmpeg", { default: true });
 class ThumbnailGenerator {
     static getTime(videoPath) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!ffmpeg) {
+                throw new Error("fluent-ffmpeg module is not installed. Some features may be disabled.");
+            }
             return new Promise((resolve, reject) => {
-                fluent_ffmpeg_1.default.ffprobe(videoPath, (err, metadata) => {
+                ffmpeg.ffprobe(videoPath, (err, metadata) => {
                     if (err) {
                         console.error("Error fetching metadata:", err);
                         reject(err);
@@ -73,10 +38,13 @@ class ThumbnailGenerator {
     }
     static fromVideo(videoPath) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!ffmpeg) {
+                throw new Error("fluent-ffmpeg module is not installed. Some features may be disabled.");
+            }
             const tempImagePath = path_1.default.join(os_1.default.tmpdir(), `thumbnail_${Date.now()}.png`);
             try {
                 yield new Promise((resolve, reject) => {
-                    (0, fluent_ffmpeg_1.default)(videoPath)
+                    ffmpeg(videoPath)
                         .on("end", () => resolve(undefined))
                         .on("error", reject)
                         .screenshots({
@@ -100,6 +68,9 @@ class ThumbnailGenerator {
     }
     static fromImage(imagePath_1) {
         return __awaiter(this, arguments, void 0, function* (imagePath, width = 320) {
+            if (!sharp) {
+                throw new Error("sharp module is not installed. Some features may be disabled.");
+            }
             try {
                 const buffer = yield sharp(imagePath).resize(width).toBuffer();
                 return buffer.toString("base64");

package/rubjs/utils/VoiceChatClient.d.ts

@@ -15,8 +15,8 @@ declare class VoiceChatClient {
     private lastPosition;
     private intervalId?;
     private isManualSkip;
-    private getAnyMusicCallback;
-    constructor(getAnyMusicCallback?: () => Promise<string>);
+    private getMusicUrl;
+    constructor(getMusicUrl?: () => Promise<string>);
     play(filePath?: string): Promise<void>;
     stop(): void;
     resume(): void;

package/rubjs/utils/VoiceChatClient.js

@@ -10,9 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const child_process_1 = require("child_process");
-const wrtc_1 = require("wrtc");
+const optional_require_1 = require("optional-require");
+const optionalWrtc = (0, optional_require_1.optionalRequire)("wrtc");
 class VoiceChatClient {
-    constructor(getAnyMusicCallback) {
+    constructor(getMusicUrl) {
         this.buffer = Buffer.alloc(0);
         this.frameSize = 960;
         this.playlist = [];
@@ -20,11 +21,14 @@ class VoiceChatClient {
         this.isPaused = false;
         this.lastPosition = 0;
         this.isManualSkip = false;
-        this.pc = new wrtc_1.RTCPeerConnection();
-        this.source = new wrtc_1.nonstandard.RTCAudioSource();
+        if (!optionalWrtc) {
+            throw new Error("wrtc module is not installed. Some features may be disabled.");
+        }
+        this.pc = new optionalWrtc.RTCPeerConnection();
+        this.source = new optionalWrtc.nonstandard.RTCAudioSource();
         this.track = this.source.createTrack();
         this.pc.addTrack(this.track);
-        this.getAnyMusicCallback = getAnyMusicCallback;
+        this.getMusicUrl = getMusicUrl;
     }
     play(filePath) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -32,8 +36,8 @@ class VoiceChatClient {
                 this.stop();
             if (!filePath) {
                 if (this.playlist.length === 0) {
-                    if (this.getAnyMusicCallback) {
-                        this.playlist = [yield this.getAnyMusicCallback()];
+                    if (this.getMusicUrl) {
+                        this.playlist = [yield this.getMusicUrl()];
                     }
                     else
                         return;
@@ -127,8 +131,8 @@ class VoiceChatClient {
                 this.play(this.playlist[this.currentIndex]);
             }
             else {
-                if (this.getAnyMusicCallback) {
-                    this.playlist = [...this.playlist, yield this.getAnyMusicCallback()];
+                if (this.getMusicUrl) {
+                    this.playlist = [...this.playlist, yield this.getMusicUrl()];
                     yield this.next();
                 }
             }
@@ -165,7 +169,7 @@ class VoiceChatClient {
             yield this.pc.setLocalDescription(offer);
             const connect = yield client.joinGroupVoiceChat(chatGuid, voiceChatId, offer.sdp, client.userGuid);
             const sdpAnswer = connect.sdp_answer_data;
-            yield this.pc.setRemoteDescription(new wrtc_1.RTCSessionDescription({ type: "answer", sdp: sdpAnswer }));
+            yield this.pc.setRemoteDescription(new optionalWrtc.RTCSessionDescription({ type: "answer", sdp: sdpAnswer }));
             yield client.setVoiceChatState(chatGuid, voiceChatId);
         });
     }

package/rubjs/utils/index.d.ts

@@ -1,4 +1,5 @@
 import Filters from "./filters";
 import Utils from "./utils";
 import VoiceChatClient from "./VoiceChatClient";
-export { Filters, Utils, VoiceChatClient };
+import SendLiveClient from "./sendLiveClient";
+export { Filters, Utils, VoiceChatClient, SendLiveClient };

package/rubjs/utils/index.js

@@ -3,10 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VoiceChatClient = exports.Utils = exports.Filters = void 0;
+exports.SendLiveClient = exports.VoiceChatClient = exports.Utils = exports.Filters = void 0;
 const filters_1 = __importDefault(require("./filters"));
 exports.Filters = filters_1.default;
 const utils_1 = __importDefault(require("./utils"));
 exports.Utils = utils_1.default;
 const VoiceChatClient_1 = __importDefault(require("./VoiceChatClient"));
 exports.VoiceChatClient = VoiceChatClient_1.default;
+const sendLiveClient_1 = __importDefault(require("./sendLiveClient"));
+exports.SendLiveClient = sendLiveClient_1.default;

package/rubjs/utils/sendLiveClient.d.ts

@@ -0,0 +1,25 @@
+import Client from "..";
+declare class SendLiveClient {
+    private client;
+    private title;
+    private object_guid;
+    private streamUrlRegex;
+    private streamKeyRegex;
+    private playlist;
+    private currentIndex;
+    private getVideoUrl;
+    private ffmpeg?;
+    private isPaused;
+    private lastPosition;
+    constructor(client: Client, title: string, object_guid: string, getVideoUrl?: () => Promise<string>);
+    detectOrientation(filePath: string): Promise<boolean>;
+    createLive(filePath?: string, startTime?: number): Promise<void>;
+    stop(): void;
+    getCurrentTime(): Promise<void>;
+    resume(): void;
+    next(): Promise<void>;
+    previous(): void;
+    addToPlaylist(filePath: string): void;
+    removeFromPlaylist(filePath: string): void;
+}
+export default SendLiveClient;

package/rubjs/utils/sendLiveClient.js

@@ -0,0 +1,146 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const child_process_1 = require("child_process");
+class SendLiveClient {
+    constructor(client, title, object_guid, getVideoUrl) {
+        this.streamUrlRegex = /Stream url:\s*(rtmp:\/\/[^\n]+)/;
+        this.streamKeyRegex = /Stream key:\s*([^\n]+)/;
+        this.playlist = [];
+        this.currentIndex = 0;
+        this.isPaused = false;
+        this.lastPosition = 0;
+        this.client = client;
+        this.getVideoUrl = getVideoUrl;
+        this.title = title;
+        this.object_guid = object_guid;
+    }
+    detectOrientation(filePath) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve) => {
+                const ffprobe = (0, child_process_1.spawn)("ffprobe", [
+                    "-v", "error",
+                    "-select_streams", "v:0",
+                    "-show_entries", "stream=width,height",
+                    "-of", "csv=p=0",
+                    filePath,
+                ]);
+                let output = "";
+                ffprobe.stdout.on("data", (data) => {
+                    output += data.toString();
+                });
+                ffprobe.on("close", () => {
+                    const [width, height] = output.trim().split(",").map(Number);
+                    resolve(width > height);
+                });
+            });
+        });
+    }
+    createLive(filePath_1) {
+        return __awaiter(this, arguments, void 0, function* (filePath, startTime = 0) {
+            var _a;
+            if (!filePath) {
+                if (!this.playlist.length && this.getVideoUrl) {
+                    this.playlist = [yield this.getVideoUrl()];
+                }
+                filePath = (_a = this.playlist[this.currentIndex]) !== null && _a !== void 0 ? _a : "";
+            }
+            if (!filePath)
+                return;
+            let isLandscape = yield this.detectOrientation(filePath);
+            let res = yield this.client.sendLive(this.title, this.object_guid, filePath);
+            const streamUrl = res.publish_text.match(this.streamUrlRegex)[1];
+            const streamKey = res.publish_text.match(this.streamKeyRegex)[1];
+            const streamSendUrl = streamUrl + streamKey;
+            const resolution = !isLandscape ? "1920:1080" : "1080:1920";
+            const rotateFilter = !isLandscape ? "" : "transpose=1,";
+            const seekArgs = startTime > 0 ? ["-ss", startTime.toFixed(2)] : [];
+            this.ffmpeg = (0, child_process_1.spawn)("ffmpeg", [
+                "-re",
+                ...seekArgs,
+                "-i", filePath,
+                "-c:v", "libx264",
+                "-preset", "ultrafast",
+                "-b:v", "1200k",
+                "-c:a", "aac",
+                "-b:a", "128k",
+                "-vf", `${rotateFilter}scale=${resolution}`,
+                "-rtbufsize", "100M",
+                "-f", "flv",
+                streamSendUrl,
+            ]);
+            this.ffmpeg.on("close", (code) => {
+                console.log(`FFmpeg process exited with code ${code}`);
+            });
+        });
+    }
+    stop() {
+        if (this.ffmpeg) {
+            this.ffmpeg.kill();
+            this.ffmpeg = undefined;
+            this.isPaused = true;
+            this.getCurrentTime();
+        }
+    }
+    getCurrentTime() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.ffmpeg)
+                return;
+            const ffprobe = (0, child_process_1.spawn)("ffprobe", ["-i", this.playlist[this.currentIndex], "-show_entries", "format=start_time", "-of", "default=noprint_wrappers=1:nokey=1"]);
+            let output = "";
+            ffprobe.stdout.on("data", (data) => {
+                output += data.toString();
+            });
+            ffprobe.on("close", () => {
+                this.lastPosition = parseFloat(output.trim()) || 0;
+            });
+        });
+    }
+    resume() {
+        if (this.isPaused) {
+            this.createLive(this.playlist[this.currentIndex], this.lastPosition);
+            this.isPaused = false;
+        }
+    }
+    next() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.playlist.length > this.currentIndex + 1) {
+                this.stop();
+                this.currentIndex += 1;
+                this.lastPosition = 0;
+                this.isPaused = true;
+                this.createLive(this.playlist[this.currentIndex]);
+            }
+        });
+    }
+    previous() {
+        if (this.currentIndex > 0) {
+            this.stop();
+            this.currentIndex--;
+            this.lastPosition = 0;
+            this.isPaused = true;
+            this.createLive();
+        }
+    }
+    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--;
+            }
+        }
+    }
+}
+exports.default = SendLiveClient;