From b9ec84296036db5d71b9b3956443d5680d260ef5 Mon Sep 17 00:00:00 2001
From: zhiyu <542716863@qq.com>
Date: Tue, 2 Jul 2024 01:07:24 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20pref:=20=E6=8F=90=E5=8D=87=20dy?=
 =?UTF-8?q?=20=E8=A7=A3=E6=9E=90=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/tools.js      | 35 +++++++++++++++++++++++++++--------
 constants/tools.js |  6 ++++++
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/apps/tools.js b/apps/tools.js
index ac8d8b7..21235df 100644
--- a/apps/tools.js
+++ b/apps/tools.js
@@ -10,7 +10,8 @@ import HttpProxyAgent from "https-proxy-agent";
 import { exec, execSync } from "child_process";
 import { checkAndRemoveFile, deleteFolderRecursive, mkdirIfNotExists } from "../utils/file.js";
 import {
-    downloadBFile, filterBiliDescLink,
+    downloadBFile,
+    filterBiliDescLink,
     getBiliAudio,
     getBiliVideoWithSession,
     getDownloadUrl,
@@ -24,7 +25,8 @@ import { downloadM3u8Videos, mergeAcFileToMp4, parseM3u8, parseUrl } from "../ut
 import {
     BILI_DEFAULT_INTRO_LEN_LIMIT,
     DIVIDING_LINE,
-    douyinTypeMap, HELP_DOC,
+    douyinTypeMap,
+    HELP_DOC,
     REDIS_YUNZAI_ISOVERSEA,
     REDIS_YUNZAI_LAGRANGE,
     SUMMARY_PROMPT,
@@ -33,13 +35,16 @@ import {
     XHS_NO_WATERMARK_HEADER,
 } from "../constants/constant.js";
 import {
+    checkCommandExists,
+    downloadAudio,
     downloadImg,
-    downloadAudio, estimateReadingTime,
+    estimateReadingTime,
     formatBiliInfo,
-    getIdVideo, retryAxiosReq,
+    getIdVideo,
+    retryAxiosReq,
     secondsToTime,
     testProxy,
-    truncateString, checkCommandExists
+    truncateString
 } from "../utils/common.js";
 import config from "../model/index.js";
 import Translate from "../utils/trans-strategy.js";
@@ -53,10 +58,13 @@ import { getWbi } from "../utils/biliWbi.js";
 import {
     BILI_SUMMARY,
     DY_INFO,
+    DY_TOUTIAO_INFO,
     GENERAL_REQ_LINK,
-    MIYOUSHE_ARTICLE, NETEASE_API_CN,
+    MIYOUSHE_ARTICLE,
+    NETEASE_API_CN,
     NETEASE_SONG_DETAIL,
-    NETEASE_SONG_DOWNLOAD, NETEASE_TEMP_API,
+    NETEASE_SONG_DOWNLOAD,
+    NETEASE_TEMP_API,
     TIKTOK_INFO,
     TWITTER_TWEET_INFO,
     WEIBO_SINGLE_INFO,
@@ -282,7 +290,18 @@ export class tools extends plugin {
                 let resUrl;
                 // 判断是否使用压缩格式
                 const { play_addr_265, play_addr_h264, play_addr } = item.video;
+                // 使用今日头条 CDN 进一步加快解析速度
                 if (this.douyinCompression === 1) {
+                    const videoAddrURI = Math.random() > 0.5 ? play_addr_265.uri : play_addr_h264.uri;
+                    resUrl = DY_TOUTIAO_INFO.replace("1080p", "720p").replace("{}", videoAddrURI);
+                } else {
+                    // 原始格式，ps. videoAddrList这里[0]、[1]是 http，[最后一个]是 https
+                    const videoAddrURI = play_addr.uri;
+                    resUrl = DY_TOUTIAO_INFO.replace("{}", videoAddrURI);
+                }
+
+                // ⚠️ 暂时废弃代码
+                /*if (this.douyinCompression === 1) {
                     // H.265压缩率更高、流量省一半. 相对于H.264
                     // 265 和 264 随机均衡负载
                     const videoAddrList = Math.random() > 0.5 ? play_addr_265.url_list : play_addr_h264.url_list;
@@ -291,7 +310,7 @@ export class tools extends plugin {
                     // 原始格式，ps. videoAddrList这里[0]、[1]是 http，[最后一个]是 https
                     const videoAddrList = play_addr.url_list;
                     resUrl = videoAddrList[videoAddrList.length - 1] || videoAddrList[0];
-                }
+                }*/
 
                 // logger.info(resUrl);
                 const path = `${ this.getCurDownloadPath(e) }/temp.mp4`;
diff --git a/constants/tools.js b/constants/tools.js
index 8a1b2ca..1cc6eeb 100644
--- a/constants/tools.js
+++ b/constants/tools.js
@@ -73,6 +73,12 @@ export const XHS_VIDEO = "http://sns-video-bd.xhscdn.com/"
  */
 export const DY_INFO = "https://www.douyin.com/aweme/v1/web/aweme/detail/?device_platform=webapp&aid=6383&channel=channel_pc_web&aweme_id={}&pc_client_type=1&version_code=190500&version_name=19.5.0&cookie_enabled=true&screen_width=1344&screen_height=756&browser_language=zh-CN&browser_platform=Win32&browser_name=Firefox&browser_version=118.0&browser_online=true&engine_name=Gecko&engine_version=109.0&os_name=Windows&os_version=10&cpu_core_num=16&device_memory=&platform=PC"
 
+/**
+ * 今日头条 DY API
+ * @type {string}
+ */
+export const DY_TOUTIAO_INFO = "https://aweme.snssdk.com/aweme/v1/play/?video_id={}&ratio=1080p&line=0"
+
 /**
  * Tiktok API
  * @type {string}