@ziplayer/plugin 0.1.51 → 0.2.1-dev-1

package/dist/utils/sabr-stream-factory.js

@@ -3,24 +3,168 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_SABR_OPTIONS = void 0;
 exports.createSabrStream = createSabrStream;
 exports.createOutputStream = createOutputStream;
-exports.createStreamSink = createStreamSink;
+exports.sanitizeFileName = sanitizeFileName;
+exports.bytesToMB = bytesToMB;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const os_1 = require("os");
+const youtubei_js_1 = require("youtubei.js");
+const sabr_stream_1 = require("googlevideo/sabr-stream");
+const utils_1 = require("googlevideo/utils");
+const bgutils_js_1 = require("bgutils-js");
+const jsdom_1 = require("jsdom");
+const stream_converter_1 = require("./stream-converter");
 /**
- * Creates a sabr stream for YouTube video download
+ * Generates a web PoToken for YouTube authentication
+ * This is required for accessing restricted video content
  */
-async function createSabrStream(videoId, options) {
+async function generateWebPoToken(contentBinding) {
     try {
-        // Dynamic import to avoid build-time errors
-        const sabrModule = require("googlevideo/sabr-stream");
-        const createSabrStreamImpl = sabrModule.createSabrStream;
-        const streamResults = await createSabrStreamImpl(videoId, options);
-        return { streamResults };
+        const requestKey = "O43z0dpjhgX20SCx4KAo";
+        if (!contentBinding)
+            throw new Error("Could not get visitor data");
+        const dom = new jsdom_1.JSDOM();
+        Object.assign(globalThis, {
+            window: dom.window,
+            document: dom.window.document,
+        });
+        const bgConfig = {
+            fetch: (input, init) => fetch(input, init),
+            globalObj: globalThis,
+            identifier: contentBinding,
+            requestKey,
+        };
+        const bgChallenge = await bgutils_js_1.BG.Challenge.create(bgConfig);
+        if (!bgChallenge)
+            throw new Error("Could not get challenge");
+        const interpreterJavascript = bgChallenge.interpreterJavascript.privateDoNotAccessOrElseSafeScriptWrappedValue;
+        if (interpreterJavascript) {
+            new Function(interpreterJavascript)();
+        }
+        else
+            throw new Error("Could not load VM");
+        const poTokenResult = await bgutils_js_1.BG.PoToken.generate({
+            program: bgChallenge.program,
+            globalName: bgChallenge.globalName,
+            bgConfig,
+        });
+        const placeholderPoToken = bgutils_js_1.BG.PoToken.generatePlaceholder(contentBinding);
+        return {
+            visitorData: contentBinding,
+            placeholderPoToken,
+            poToken: poTokenResult.poToken,
+        };
     }
     catch (error) {
-        // Fallback implementation if sabr download is not available
-        throw new Error(`Sabr download not available: ${error}`);
+        console.warn("PoToken generation failed, continuing without it:", error);
+        return {
+            visitorData: contentBinding,
+            placeholderPoToken: "",
+            poToken: "",
+        };
+    }
+}
+/**
+ * Makes a proper player request to YouTube API
+ */
+async function makePlayerRequest(innertube, videoId, reloadPlaybackContext) {
+    const watchEndpoint = new youtubei_js_1.YTNodes.NavigationEndpoint({
+        watchEndpoint: { videoId },
+    });
+    const extraArgs = {
+        playbackContext: {
+            adPlaybackContext: { pyv: true },
+            contentPlaybackContext: {
+                vis: 0,
+                splay: false,
+                lactMilliseconds: "-1",
+                signatureTimestamp: innertube.session.player?.signature_timestamp,
+            },
+        },
+        contentCheckOk: true,
+        racyCheckOk: true,
+    };
+    if (reloadPlaybackContext) {
+        extraArgs.playbackContext.reloadPlaybackContext = reloadPlaybackContext;
+    }
+    return watchEndpoint.call(innertube.actions, {
+        ...extraArgs,
+        parse: true,
+    });
+}
+/**
+ * YouTube VM shim
+ * This allows the SABR stream to execute YouTube's custom JavaScript for deciphering signatures and generating tokens
+ */
+youtubei_js_1.Platform.shim.eval = async (data, env) => {
+    const properties = [];
+    if (env.n)
+        properties.push(`n: exportedVars.nFunction("${env.n}")`);
+    if (env.sig)
+        properties.push(`sig: exportedVars.sigFunction("${env.sig}")`);
+    const code = `${data.output}\nreturn { ${properties.join(", ")} }`;
+    return new Function(code)();
+};
+/**
+ * Creates a SABR audio stream for YouTube video download
+ * This provides better quality and more reliable streaming than standard methods
+ */
+async function createSabrStream(videoId, innertube, options) {
+    try {
+        // Generate PoToken for authentication
+        const webPo = await generateWebPoToken(videoId);
+        // Make initial player request
+        const player = await makePlayerRequest(innertube, videoId);
+        const title = player.video_details?.title || "unknown";
+        const serverAbrStreamingUrl = await innertube.session.player?.decipher(player.streaming_data?.server_abr_streaming_url);
+        const ustreamerConfig = player.player_config?.media_common_config.media_ustreamer_request_config?.video_playback_ustreamer_config;
+        if (!serverAbrStreamingUrl || !ustreamerConfig) {
+            throw new Error("Missing SABR streaming config");
+        }
+        const sabrFormats = player.streaming_data?.adaptive_formats.map((f) => (0, utils_1.buildSabrFormat)(f)) || [];
+        const sabr = new sabr_stream_1.SabrStream({
+            formats: sabrFormats,
+            serverAbrStreamingUrl,
+            videoPlaybackUstreamerConfig: ustreamerConfig,
+            poToken: webPo.poToken,
+            clientInfo: {
+                clientName: parseInt(youtubei_js_1.Constants.CLIENT_NAME_IDS[innertube.session.context.client.clientName]),
+                clientVersion: innertube.session.context.client.clientVersion,
+            },
+        });
+        // Handle player response reload events
+        sabr.on("reloadPlayerResponse", async (ctx) => {
+            try {
+                const pr = await makePlayerRequest(innertube, videoId, ctx);
+                const url = await innertube.session.player?.decipher(pr.streaming_data?.server_abr_streaming_url);
+                const config = pr.player_config?.media_common_config.media_ustreamer_request_config?.video_playback_ustreamer_config;
+                if (url && config) {
+                    sabr.setStreamingURL(url);
+                    sabr.setUstreamerConfig(config);
+                }
+            }
+            catch (error) {
+                console.error("Failed to reload player response:", error);
+            }
+        });
+        // Start the stream with audio preference
+        const { audioStream, selectedFormats } = await sabr.start({
+        // audioQuality: options?.audioQuality || "high",
+        });
+        // Convert Web Stream to Node.js Readable stream
+        const nodeStream = (0, stream_converter_1.webStreamToNodeStream)(audioStream);
+        return {
+            title,
+            stream: nodeStream,
+            format: {
+                mimeType: selectedFormats.audioFormat.mimeType || "audio/webm",
+                itag: selectedFormats.audioFormat.itag || 0,
+                contentLength: selectedFormats.audioFormat.contentLength || 0,
+            },
+        };
+    }
+    catch (error) {
+        throw new Error(`SABR stream creation failed: ${error instanceof Error ? error.message : String(error)}`);
     }
 }
 /**
@@ -38,23 +182,16 @@ function createOutputStream(videoTitle, mimeType) {
     };
 }
 /**
- * Creates a stream sink for piping data with progress tracking
+ * Sanitizes a filename by removing invalid characters
  */
-function createStreamSink(format, outputStream, progressBar) {
-    return new WritableStream({
-        start() {
-            // Initialize progress tracking
-        },
-        write(chunk) {
-            outputStream.write(chunk);
-            if (progressBar) {
-                progressBar.increment(chunk.length);
-            }
-        },
-        close() {
-            outputStream.end();
-        },
-    });
+function sanitizeFileName(name) {
+    return name.replace(/[^\w\d]+/g, "_").slice(0, 128);
+}
+/**
+ * Converts bytes to megabytes
+ */
+function bytesToMB(bytes) {
+    return (bytes / 1024 / 1024).toFixed(2);
 }
 /**
  * Gets file extension from MIME type
@@ -77,7 +214,7 @@ exports.DEFAULT_SABR_OPTIONS = {
     preferWebM: true,
     preferOpus: true,
     videoQuality: "720p",
-    audioQuality: "AUDIO_QUALITY_MEDIUM",
+    audioQuality: "high",
     enabledTrackTypes: "VIDEO_AND_AUDIO",
 };
 //# sourceMappingURL=sabr-stream-factory.js.map

package/dist/utils/sabr-stream-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"sabr-stream-factory.js","sourceRoot":"","sources":["../../src/utils/sabr-stream-factory.ts"],"names":[],"mappings":";;;AAkBA,4CAaC;AAKD,gDAYC;AAKD,4CAeC;AApED,2BAAuC;AACvC,+BAA4B;AAC5B,2BAA4B;AAa5B;;GAEG;AACI,KAAK,UAAU,gBAAgB,CAAC,OAAe,EAAE,OAA4B;IACnF,IAAI,CAAC;QACJ,4CAA4C;QAC5C,MAAM,UAAU,GAAG,OAAO,CAAC,yBAAyB,CAAQ,CAAC;QAC7D,MAAM,oBAAoB,GAAG,UAAU,CAAC,gBAAgB,CAAC;QAEzD,MAAM,aAAa,GAAG,MAAM,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAEnE,OAAO,EAAE,aAAa,EAAE,CAAC;IAC1B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,4DAA4D;QAC5D,MAAM,IAAI,KAAK,CAAC,gCAAgC,KAAK,EAAE,CAAC,CAAC;IAC1D,CAAC;AACF,CAAC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAAC,UAAkB,EAAE,QAAgB;IACtE,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAClF,MAAM,SAAS,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,GAAG,cAAc,IAAI,SAAS,EAAE,CAAC;IAClD,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAA,WAAM,GAAE,EAAE,QAAQ,CAAC,CAAC;IAE1C,MAAM,MAAM,GAAG,IAAA,sBAAiB,EAAC,QAAQ,CAAC,CAAC;IAE3C,OAAO;QACN,MAAM;QACN,QAAQ;KACR,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAgB,gBAAgB,CAAC,MAAW,EAAE,YAAmC,EAAE,WAAgB;IAClG,OAAO,IAAI,cAAc,CAAC;QACzB,KAAK;YACJ,+BAA+B;QAChC,CAAC;QACD,KAAK,CAAC,KAAK;YACV,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC1B,IAAI,WAAW,EAAE,CAAC;gBACjB,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACrC,CAAC;QACF,CAAC;QACD,KAAK;YACJ,YAAY,CAAC,GAAG,EAAE,CAAC;QACpB,CAAC;KACD,CAAC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,wBAAwB,CAAC,QAAgB;IACjD,MAAM,OAAO,GAA8B;QAC1C,WAAW,EAAE,KAAK;QAClB,YAAY,EAAE,MAAM;QACpB,WAAW,EAAE,KAAK;QAClB,WAAW,EAAE,KAAK;QAClB,YAAY,EAAE,MAAM;QACpB,WAAW,EAAE,KAAK;KAClB,CAAC;IAEF,OAAO,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC;AACnC,CAAC;AAED;;GAEG;AACU,QAAA,oBAAoB,GAAwB;IACxD,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,IAAI;IAChB,YAAY,EAAE,MAAM;IACpB,YAAY,EAAE,sBAAsB;IACpC,iBAAiB,EAAE,iBAAiB;CACpC,CAAC"}
+{"version":3,"file":"sabr-stream-factory.js","sourceRoot":"","sources":["../../src/utils/sabr-stream-factory.ts"],"names":[],"mappings":"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"}

package/dist/utils/stream-converter.d.ts

@@ -1,10 +1,7 @@
 import { Readable } from "stream";
 /**
  * Converts a Web ReadableStream to a Node.js Readable stream
+ * with proper cleanup handling to prevent "Controller is already closed" errors
  */
 export declare function webStreamToNodeStream(webStream: ReadableStream): Readable;
-/**
- * Converts a Web ReadableStream to a Node.js Readable stream with progress tracking
- */
-export declare function webStreamToNodeStreamWithProgress(webStream: ReadableStream, progressCallback?: (bytesRead: number) => void): Readable;
 //# sourceMappingURL=stream-converter.d.ts.map

package/dist/utils/stream-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream-converter.d.ts","sourceRoot":"","sources":["../../src/utils/stream-converter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,cAAc,GAAG,QAAQ,CA8BzE;AAED;;GAEG;AACH,wBAAgB,iCAAiC,CAChD,SAAS,EAAE,cAAc,EACzB,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,GAC5C,QAAQ,CAmCV"}
+{"version":3,"file":"stream-converter.d.ts","sourceRoot":"","sources":["../../src/utils/stream-converter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,cAAc,GAAG,QAAQ,CAuGzE"}

package/dist/utils/stream-converter.js

@@ -1,71 +1,103 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webStreamToNodeStream = webStreamToNodeStream;
-exports.webStreamToNodeStreamWithProgress = webStreamToNodeStreamWithProgress;
 const stream_1 = require("stream");
 /**
  * Converts a Web ReadableStream to a Node.js Readable stream
+ * with proper cleanup handling to prevent "Controller is already closed" errors
  */
 function webStreamToNodeStream(webStream) {
+    let reader = null;
+    let pumpActive = true;
+    let abortController = null;
     const nodeStream = new stream_1.Readable({
         read() {
             // This will be handled by the Web Stream reader
         },
+        destroy(error, callback) {
+            // Gracefully stop the pump when stream is destroyed
+            pumpActive = false;
+            // Cancel reader if active
+            if (reader) {
+                try {
+                    // reader.cancel() will abort the fetch
+                    reader.cancel().catch(() => {
+                        // Ignore cancel errors
+                    });
+                    reader = null;
+                }
+                catch { }
+            }
+            // Abort any pending operations
+            if (abortController) {
+                try {
+                    abortController.abort();
+                }
+                catch { }
+                abortController = null;
+            }
+            callback(error);
+        },
     });
+    // Create abort controller for graceful shutdown
+    abortController = new AbortController();
     // Create a reader from the Web Stream
-    const reader = webStream.getReader();
+    reader = webStream.getReader();
     // Read chunks and push to Node.js stream
     const pump = async () => {
         try {
-            while (true) {
+            while (pumpActive && reader) {
                 const { done, value } = await reader.read();
+                // Check if pump was stopped during read
+                if (!pumpActive || !reader) {
+                    break;
+                }
                 if (done) {
                     nodeStream.push(null); // End the stream
                     break;
                 }
-                nodeStream.push(Buffer.from(value));
+                if (value && pumpActive) {
+                    nodeStream.push(Buffer.from(value));
+                }
             }
         }
         catch (error) {
-            nodeStream.destroy(error);
-        }
-    };
-    // Start pumping data
-    pump();
-    return nodeStream;
-}
-/**
- * Converts a Web ReadableStream to a Node.js Readable stream with progress tracking
- */
-function webStreamToNodeStreamWithProgress(webStream, progressCallback) {
-    const nodeStream = new stream_1.Readable({
-        read() {
-            // This will be handled by the Web Stream reader
-        },
-    });
-    let bytesRead = 0;
-    const reader = webStream.getReader();
-    const pump = async () => {
-        try {
-            while (true) {
-                const { done, value } = await reader.read();
-                if (done) {
-                    nodeStream.push(null); // End the stream
-                    break;
+            // Only destroy if pump is still active and stream exists
+            if (pumpActive) {
+                const errorMsg = error instanceof Error ? error.message : String(error);
+                // Ignore "Controller is already closed" and stream cancelled errors
+                if (errorMsg.includes("Controller is already closed") ||
+                    errorMsg.includes("already been cancelled") ||
+                    errorMsg.includes("stream closed") ||
+                    errorMsg.includes("aborted")) {
+                    // Stream was destroyed externally, just end cleanly
+                    nodeStream.push(null);
                 }
-                const buffer = Buffer.from(value);
-                nodeStream.push(buffer);
-                bytesRead += buffer.length;
-                if (progressCallback) {
-                    progressCallback(bytesRead);
+                else {
+                    // Real error, report it
+                    nodeStream.destroy(error);
                 }
             }
         }
-        catch (error) {
-            nodeStream.destroy(error);
+        finally {
+            // Cleanup reader when pump ends
+            try {
+                if (reader) {
+                    await reader.cancel();
+                    reader = null;
+                }
+            }
+            catch { }
+            pumpActive = false;
         }
     };
-    pump();
+    // Start pumping data
+    pump().catch((error) => {
+        // Catch any unhandled promise rejection
+        if (pumpActive) {
+            console.error("[stream-converter] Pump error:", error);
+        }
+    });
     return nodeStream;
 }
 //# sourceMappingURL=stream-converter.js.map

package/dist/utils/stream-converter.js.map

@@ -1 +1 @@
-{"version":3,"file":"stream-converter.js","sourceRoot":"","sources":["../../src/utils/stream-converter.ts"],"names":[],"mappings":";;AAKA,sDA8BC;AAKD,8EAsCC;AA9ED,mCAAkC;AAElC;;GAEG;AACH,SAAgB,qBAAqB,CAAC,SAAyB;IAC9D,MAAM,UAAU,GAAG,IAAI,iBAAQ,CAAC;QAC/B,IAAI;YACH,gDAAgD;QACjD,CAAC;KACD,CAAC,CAAC;IAEH,sCAAsC;IACtC,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAErC,yCAAyC;IACzC,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;QACvB,IAAI,CAAC;YACJ,OAAO,IAAI,EAAE,CAAC;gBACb,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC5C,IAAI,IAAI,EAAE,CAAC;oBACV,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB;oBACxC,MAAM;gBACP,CAAC;gBACD,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACrC,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,UAAU,CAAC,OAAO,CAAC,KAAc,CAAC,CAAC;QACpC,CAAC;IACF,CAAC,CAAC;IAEF,qBAAqB;IACrB,IAAI,EAAE,CAAC;IAEP,OAAO,UAAU,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,SAAgB,iCAAiC,CAChD,SAAyB,EACzB,gBAA8C;IAE9C,MAAM,UAAU,GAAG,IAAI,iBAAQ,CAAC;QAC/B,IAAI;YACH,gDAAgD;QACjD,CAAC;KACD,CAAC,CAAC;IAEH,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAErC,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;QACvB,IAAI,CAAC;YACJ,OAAO,IAAI,EAAE,CAAC;gBACb,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC5C,IAAI,IAAI,EAAE,CAAC;oBACV,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB;oBACxC,MAAM;gBACP,CAAC;gBAED,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAClC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAExB,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC;gBAC3B,IAAI,gBAAgB,EAAE,CAAC;oBACtB,gBAAgB,CAAC,SAAS,CAAC,CAAC;gBAC7B,CAAC;YACF,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,UAAU,CAAC,OAAO,CAAC,KAAc,CAAC,CAAC;QACpC,CAAC;IACF,CAAC,CAAC;IAEF,IAAI,EAAE,CAAC;IAEP,OAAO,UAAU,CAAC;AACnB,CAAC"}
+{"version":3,"file":"stream-converter.js","sourceRoot":"","sources":["../../src/utils/stream-converter.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,45 +1,46 @@
-{
-	"name": "@ziplayer/plugin",
-	"version": "0.1.51",
-	"description": "A modular Discord voice player with plugin system",
-	"keywords": [
-		"ZiPlayer",
-		"@ziplayer/plugin",
-		"discord",
-		"music",
-		"player",
-		"voice"
-	],
-	"homepage": "https://player.ziji.world",
-	"bugs": {
-		"url": "https://github.com/ZiProject/ZiPlayer/issues"
-	},
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/ZiProject/ZiPlayer.git"
-	},
-	"license": "MIT",
-	"author": "Ziji",
-	"main": "dist/index.js",
-	"types": "dist/index.d.ts",
-	"scripts": {
-		"build": "tsc",
-		"dev": "tsc --watch",
-		"prepare": "npm run build"
-	},
-	"dependencies": {
-		"@zibot/scdl": "^0.0.5",
-		"@zibot/zitts": "^0.0.3",
-		"axios": "^1.12.2",
-		"cli-progress": "^3.12.0",
-		"googlevideo": "^1.0.0",
-		"music-metadata": "^11.9.0",
-		"youtube-sr": "^4.3.4",
-		"youtubei.js": "^16.0.1",
-		"ziplayer": "^0.2.1"
-	},
-	"devDependencies": {
-		"@types/node": "^20.0.0",
-		"typescript": "^5.0.0"
-	}
-}
+{
+	"name": "@ziplayer/plugin",
+	"version": "0.2.1-dev-1",
+	"description": "A modular Discord voice player with plugin system",
+	"keywords": [
+		"ZiPlayer",
+		"@ziplayer/plugin",
+		"discord",
+		"music",
+		"player",
+		"voice"
+	],
+	"homepage": "https://player.ziji.world",
+	"bugs": {
+		"url": "https://github.com/ZiProject/ZiPlayer/issues"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/ZiProject/ZiPlayer.git"
+	},
+	"license": "MIT",
+	"author": "Ziji",
+	"main": "dist/index.js",
+	"types": "dist/index.d.ts",
+	"scripts": {
+		"build": "tsc",
+		"dev": "tsc --watch",
+		"prepare": "npm run build"
+	},
+	"dependencies": {
+		"@zibot/scdl": "^0.0.6",
+		"@zibot/zitts": "^0.0.3",
+		"axios": "^1.13.2",
+		"bgutils-js": "^3.2.0",
+		"googlevideo": "^4.0.4",
+		"jsdom": "^28.1.0",
+		"music-metadata": "^11.9.0",
+		"youtubei.js": "^16.0.1",
+		"ziplayer": "^0.2.3"
+	},
+	"devDependencies": {
+		"@types/jsdom": "^27.0.0",
+		"@types/node": "^20.0.0",
+		"typescript": "^5.0.0"
+	}
+}