koishi-plugin-video-parser-all 1.1.0 → 1.1.1

package/lib/index.d.ts

@@ -29,10 +29,10 @@ export declare const Config: Schema<{
     primaryApiUrl?: string | null | undefined;
     backupApiUrl?: string | null | undefined;
     useDedicatedApiFirst?: boolean | null | undefined;
+    platformDedicatedFirst?: import("cosmokit").Dict<boolean, string> | null | undefined;
     customApis?: ({
         platform?: "bilibili" | "douyin" | "kuaishou" | "xiaohongshu" | "weibo" | "xigua" | "youtube" | "tiktok" | "acfun" | "zhihu" | "weishi" | "huya" | "haokan" | "meipai" | "twitter" | "instagram" | "doubao" | null | undefined;
         apiUrl?: string | null | undefined;
-        useDedicatedFirst?: boolean | null | undefined;
     } & import("cosmokit").Dict)[] | null | undefined;
 } & {
     waitingTipText?: string | null | undefined;
@@ -69,10 +69,10 @@ export declare const Config: Schema<{
     primaryApiUrl: string;
     backupApiUrl: string;
     useDedicatedApiFirst: boolean;
+    platformDedicatedFirst: import("cosmokit").Dict<boolean, string>;
     customApis: Schemastery.ObjectT<{
         platform: Schema<"bilibili" | "douyin" | "kuaishou" | "xiaohongshu" | "weibo" | "xigua" | "youtube" | "tiktok" | "acfun" | "zhihu" | "weishi" | "huya" | "haokan" | "meipai" | "twitter" | "instagram" | "doubao", "bilibili" | "douyin" | "kuaishou" | "xiaohongshu" | "weibo" | "xigua" | "youtube" | "tiktok" | "acfun" | "zhihu" | "weishi" | "huya" | "haokan" | "meipai" | "twitter" | "instagram" | "doubao">;
         apiUrl: Schema<string, string>;
-        useDedicatedFirst: Schema<boolean, boolean>;
     }>[];
 } & {
     waitingTipText: string;

package/lib/index.js

@@ -10,7 +10,6 @@ const axios_1 = __importDefault(require("axios"));
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const fs_1 = require("fs");
-const promises_2 = require("stream/promises");
 const lru_cache_1 = require("lru-cache");
 exports.name = 'video-parser-all';
 exports.Config = koishi_1.Schema.intersect([
@@ -49,6 +48,27 @@ exports.Config = koishi_1.Schema.intersect([
         primaryApiUrl: koishi_1.Schema.string().default('https://api.bugpk.com/api/short_videos').description('主 API 地址'),
         backupApiUrl: koishi_1.Schema.string().default('https://api.bugpk.com/api/svparse').description('备用主 API 地址（仅支持抖音/小红书/ins/即梦）'),
         useDedicatedApiFirst: koishi_1.Schema.boolean().default(false).description('全局默认：是否优先使用平台专属 API（各平台可单独覆盖）'),
+        platformDedicatedFirst: koishi_1.Schema.dict(koishi_1.Schema.boolean())
+            .default({
+            bilibili: false,
+            douyin: false,
+            kuaishou: false,
+            xiaohongshu: false,
+            weibo: false,
+            xigua: false,
+            youtube: false,
+            tiktok: false,
+            acfun: false,
+            zhihu: false,
+            weishi: false,
+            huya: false,
+            haokan: false,
+            meipai: false,
+            twitter: false,
+            instagram: false,
+            doubao: false,
+        })
+            .description('各平台独立开关：是否优先使用专属 API（key 为平台名）'),
         customApis: koishi_1.Schema.array(koishi_1.Schema.object({
             platform: koishi_1.Schema.union([
                 koishi_1.Schema.const('bilibili').description('哔哩哔哩'),
@@ -70,8 +90,7 @@ exports.Config = koishi_1.Schema.intersect([
                 koishi_1.Schema.const('doubao').description('豆包'),
             ]).description('选择平台'),
             apiUrl: koishi_1.Schema.string().description('API 地址'),
-            useDedicatedFirst: koishi_1.Schema.boolean().default(false).description('该平台优先使用此专属 API'),
-        })).default([]).description('自定义平台专属 API，可覆盖默认专属 API，并可单独设定优先策略'),
+        })).default([]).description('自定义平台专属 API 地址，留空则使用内置默认专属 API'),
     }).description('API 选择设置'),
     koishi_1.Schema.object({
         waitingTipText: koishi_1.Schema.string().default('正在解析视频，请稍候...').description('解析等待提示'),
@@ -109,27 +128,26 @@ function linkTypeParser(content) {
     content = content.replace(/\\\//g, '/');
     const rules = [
         { pattern: /bilibili\.com\/video\/([ab]v[0-9a-zA-Z]+)/gi, type: 'bilibili', buildUrl: (id) => `https://www.bilibili.com/video/${id}` },
-        { pattern: /b23\.tv\/([0-9a-zA-Z]{5,})/gi, type: 'bilibili', buildUrl: (id) => `https://b23.tv/${id}` },
-        { pattern: /bili(?:22|23|33)\.cn\/([0-9a-zA-Z]{5,})/gi, type: 'bilibili', buildUrl: (id) => `https://bili23.cn/${id}` },
-        { pattern: /bili2233\.cn\/([0-9a-zA-Z]{5,})/gi, type: 'bilibili', buildUrl: (id) => `https://bili2233.cn/${id}` },
+        { pattern: /b23\.tv\/([0-9a-zA-Z_-]{5,})/gi, type: 'bilibili', buildUrl: (id) => `https://b23.tv/${id}` },
+        { pattern: /bili(?:22|23|33|2233)\.cn\/([0-9a-zA-Z_-]{5,})/gi, type: 'bilibili', buildUrl: (id) => `https://bili${RegExp.$1 || ''}.cn/${id}` },
         { pattern: /douyin\.com\/video\/(\d{10,})/gi, type: 'douyin', buildUrl: (id) => `https://www.douyin.com/video/${id}` },
-        { pattern: /v\.douyin\.com\/([0-9a-zA-Z]{8,})/gi, type: 'douyin', buildUrl: (id) => `https://v.douyin.com/${id}/` },
-        { pattern: /kuaishou\.com\/short-video\/([0-9a-zA-Z]{10,})/gi, type: 'kuaishou', buildUrl: (id) => `https://www.kuaishou.com/short-video/${id}` },
-        { pattern: /v\.kuaishou\.com\/([0-9a-zA-Z]{8,})/gi, type: 'kuaishou', buildUrl: (id) => `https://v.kuaishou.com/${id}` },
-        { pattern: /xiaohongshu\.com\/discovery\/item\/([0-9a-zA-Z]{10,})/gi, type: 'xiaohongshu', buildUrl: (id) => `https://www.xiaohongshu.com/discovery/item/${id}` },
-        { pattern: /xhslink\.com\/([0-9a-zA-Z]{8,})/gi, type: 'xiaohongshu', buildUrl: (id) => `https://xhslink.com/${id}` },
-        { pattern: /weibo\.com\/\d+\/([0-9a-zA-Z]{10,})/gi, type: 'weibo', buildUrl: (id) => `https://weibo.com/${id}` },
-        { pattern: /video\.weibo\.com\/show\?fid=([0-9a-zA-Z]{10,})/gi, type: 'weibo', buildUrl: (id) => `https://video.weibo.com/show?fid=${id}` },
+        { pattern: /v\.douyin\.com\/([0-9a-zA-Z_-]{8,})/gi, type: 'douyin', buildUrl: (id) => `https://v.douyin.com/${id}/` },
+        { pattern: /kuaishou\.com\/short-video\/([0-9a-zA-Z_-]{10,})/gi, type: 'kuaishou', buildUrl: (id) => `https://www.kuaishou.com/short-video/${id}` },
+        { pattern: /v\.kuaishou\.com\/([0-9a-zA-Z_-]{8,})/gi, type: 'kuaishou', buildUrl: (id) => `https://v.kuaishou.com/${id}` },
+        { pattern: /xiaohongshu\.com\/discovery\/item\/([0-9a-zA-Z_-]{10,})/gi, type: 'xiaohongshu', buildUrl: (id) => `https://www.xiaohongshu.com/discovery/item/${id}` },
+        { pattern: /xhslink\.com\/([0-9a-zA-Z_-]{8,})/gi, type: 'xiaohongshu', buildUrl: (id) => `https://xhslink.com/${id}` },
+        { pattern: /weibo\.com\/\d+\/([0-9a-zA-Z_-]{10,})/gi, type: 'weibo', buildUrl: (id) => `https://weibo.com/${id}` },
+        { pattern: /video\.weibo\.com\/show\?fid=([0-9a-zA-Z_-]{10,})/gi, type: 'weibo', buildUrl: (id) => `https://video.weibo.com/show?fid=${id}` },
         { pattern: /ixigua\.com\/(\d{10,})/gi, type: 'xigua', buildUrl: (id) => `https://www.ixigua.com/${id}` },
         { pattern: /youtube\.com\/watch\?v=([a-zA-Z0-9_-]{11})/gi, type: 'youtube', buildUrl: (id) => `https://www.youtube.com/watch?v=${id}` },
         { pattern: /youtu\.be\/([a-zA-Z0-9_-]{11})/gi, type: 'youtube', buildUrl: (id) => `https://youtu.be/${id}` },
         { pattern: /tiktok\.com\/@[\w.]+\/video\/(\d{10,})/gi, type: 'tiktok', buildUrl: (id) => `https://www.tiktok.com/@user/video/${id}` },
-        { pattern: /vm\.tiktok\.com\/([0-9a-zA-Z]{8,})/gi, type: 'tiktok', buildUrl: (id) => `https://vm.tiktok.com/${id}` },
+        { pattern: /vm\.tiktok\.com\/([0-9a-zA-Z_-]{8,})/gi, type: 'tiktok', buildUrl: (id) => `https://vm.tiktok.com/${id}` },
         { pattern: /acfun\.cn\/v\/(ac\d{10,})/gi, type: 'acfun', buildUrl: (id) => `https://www.acfun.cn/v/${id}` },
         { pattern: /zhihu\.com\/video\/(\d{10,})/gi, type: 'zhihu', buildUrl: (id) => `https://www.zhihu.com/video/${id}` },
-        { pattern: /weishi\.qq\.com\/weishi\/feed\/([0-9a-zA-Z]{10,})/gi, type: 'weishi', buildUrl: (id) => `https://weishi.qq.com/weishi/feed/${id}` },
-        { pattern: /huya\.com\/video\/([0-9a-zA-Z]{10,})/gi, type: 'huya', buildUrl: (id) => `https://www.huya.com/video/${id}` },
-        { pattern: /haokan\.baidu\.com\/v\?vid=([0-9a-zA-Z]{10,})/gi, type: 'haokan', buildUrl: (id) => `https://haokan.baidu.com/v?vid=${id}` },
+        { pattern: /weishi\.qq\.com\/weishi\/feed\/([0-9a-zA-Z_-]{10,})/gi, type: 'weishi', buildUrl: (id) => `https://weishi.qq.com/weishi/feed/${id}` },
+        { pattern: /huya\.com\/video\/([0-9a-zA-Z_-]{10,})/gi, type: 'huya', buildUrl: (id) => `https://www.huya.com/video/${id}` },
+        { pattern: /haokan\.baidu\.com\/v\?vid=([0-9a-zA-Z_-]{10,})/gi, type: 'haokan', buildUrl: (id) => `https://haokan.baidu.com/v?vid=${id}` },
         { pattern: /meipai\.com\/media\/(\d{10,})/gi, type: 'meipai', buildUrl: (id) => `https://www.meipai.com/media/${id}` },
         { pattern: /twitter\.com\/\w+\/status\/(\d{10,})/gi, type: 'twitter', buildUrl: (id) => `https://twitter.com/i/status/${id}` },
         { pattern: /x\.com\/\w+\/status\/(\d{10,})/gi, type: 'twitter', buildUrl: (id) => `https://x.com/i/status/${id}` },
@@ -140,6 +158,7 @@ function linkTypeParser(content) {
     const seen = new Set();
     for (const rule of rules) {
         let match;
+        rule.pattern.lastIndex = 0;
         while ((match = rule.pattern.exec(content)) !== null) {
             const id = match[1];
             if (seen.has(id))
@@ -476,7 +495,19 @@ async function downloadVideoFile(videoUrl, tempDir, timeout, maxSizeMB) {
         }
     });
     try {
-        await (0, promises_2.pipeline)(response.data, writer);
+        await new Promise((resolve, reject) => {
+            const stream = require('stream');
+            const pipeline = stream.promises?.pipeline || require('util').promisify(stream.pipeline);
+            if (typeof pipeline === 'function') {
+                pipeline(response.data, writer).then(resolve).catch(reject);
+            }
+            else {
+                response.data.pipe(writer);
+                writer.on('finish', resolve);
+                writer.on('error', reject);
+                response.data.on('error', reject);
+            }
+        });
         debugLog('INFO', `视频下载完成，大小: ${Math.round(downloadedSize / 1024 / 1024)}MB`);
         return filePath;
     }
@@ -525,11 +556,12 @@ function apply(ctx, config) {
     const backupSupportedPlatforms = new Set(['douyin', 'xiaohongshu', 'instagram', 'jimeng']);
     function getPlatformConfig(type) {
         const custom = config.customApis?.find((item) => item.platform === type);
+        let apiUrl = defaultDedicatedApis[type] || null;
         if (custom && custom.apiUrl) {
-            return { apiUrl: custom.apiUrl, dedicatedFirst: custom.useDedicatedFirst ?? false };
+            apiUrl = custom.apiUrl;
         }
-        const defaultUrl = defaultDedicatedApis[type] || null;
-        return { apiUrl: defaultUrl, dedicatedFirst: config.useDedicatedApiFirst ?? false };
+        const dedicatedFirst = config.platformDedicatedFirst?.[type] ?? config.useDedicatedApiFirst ?? false;
+        return { apiUrl, dedicatedFirst };
     }
     async function fetchApi(url, type) {
         const cacheKey = url;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-video-parser-all",
   "description": "Koishi 全平台视频解析插件，支持抖音/快手/B站/微博/小红书/剪映/YouTube/TikTok等20+平台",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -57,7 +57,8 @@ This is a **multi-platform video/image parsing plugin** developed for the Koishi
 | `primaryApiUrl` | string | `https://api.bugpk.com/api/short_videos` | 主 API 地址，解析时优先使用 |
 | `backupApiUrl` | string | `https://api.bugpk.com/api/svparse` | 备用主 API 地址，仅支持抖音、小红书、Instagram、即梦平台解析 |
 | `useDedicatedApiFirst` | boolean | false | 全局默认值：是否优先使用平台专属 API，各平台可单独覆盖该行为 |
-| `customApis` | array | [] | 自定义平台专属 API 列表。每项包含：`platform`（平台类型）、`apiUrl`（API 地址）、`useDedicatedFirst`（该平台是否优先使用此专属 API）。可覆盖内置默认专属 API，并独立控制专属 API 的优先策略 |
+| `platformDedicatedFirst` | object | 见下方说明 | 各平台独立开关：是否优先使用专属 API（key 为平台名）。支持的 key：bilibili、douyin、kuaishou、xiaohongshu、weibo、xigua、youtube、tiktok、acfun、zhihu、weishi、huya、haokan、meipai、twitter、instagram、doubao |
+| `customApis` | array | [] | 自定义平台专属 API 列表。每项包含：`platform`（平台类型）、`apiUrl`（API 地址）。可覆盖内置默认专属 API |
 
 ### 错误与重试设置
 | 配置项 | 类型 | 默认值 | 说明 |