koishi-plugin-video-parser-all 0.3.0 → 0.3.1

package/lib/index.d.ts

@@ -1,26 +1,54 @@
-import { Context, Schema } from 'koishi';
+import { Schema, Context } from 'koishi';
 export declare const name = "video-parser-all";
-export interface Config {
-    enable: boolean;
-    showWaitingTip: boolean;
-    waitingTipText: string;
-    sameLinkInterval: number;
-    imageParseFormat: string;
-    returnContent: {
-        showImageText: boolean;
-        showVideoUrl: boolean;
-        showVideoFile: boolean;
-    };
-    maxDescLength: number;
-    timeout: number;
-    ignoreSendError: boolean;
-    enableForward: boolean;
-    downloadVideoBeforeSend: boolean;
-    messageBufferDelay: number;
-    retryTimes: number;
-    retryInterval: number;
-    videoSendTimeout: number;
-    autoClearCacheInterval: number;
-}
-export declare const Config: Schema<Config>;
-export declare function apply(ctx: Context, config: Config): void;
+export declare const Config: Schema<Schemastery.ObjectS<{
+    enable: Schema<boolean, boolean>;
+    showWaitingTip: Schema<boolean, boolean>;
+    waitingTipText: Schema<string, string>;
+    sameLinkInterval: Schema<number, number>;
+    imageParseFormat: Schema<string, string>;
+    returnContent: Schema<Schemastery.ObjectS<{
+        showImageText: Schema<boolean, boolean>;
+        showVideoUrl: Schema<boolean, boolean>;
+        showVideoFile: Schema<boolean, boolean>;
+    }>, Schemastery.ObjectT<{
+        showImageText: Schema<boolean, boolean>;
+        showVideoUrl: Schema<boolean, boolean>;
+        showVideoFile: Schema<boolean, boolean>;
+    }>>;
+    maxDescLength: Schema<number, number>;
+    timeout: Schema<number, number>;
+    ignoreSendError: Schema<boolean, boolean>;
+    enableForward: Schema<boolean, boolean>;
+    downloadVideoBeforeSend: Schema<boolean, boolean>;
+    messageBufferDelay: Schema<number, number>;
+    retryTimes: Schema<number, number>;
+    retryInterval: Schema<number, number>;
+    videoSendTimeout: Schema<number, number>;
+    autoClearCacheInterval: Schema<number, number>;
+}>, Schemastery.ObjectT<{
+    enable: Schema<boolean, boolean>;
+    showWaitingTip: Schema<boolean, boolean>;
+    waitingTipText: Schema<string, string>;
+    sameLinkInterval: Schema<number, number>;
+    imageParseFormat: Schema<string, string>;
+    returnContent: Schema<Schemastery.ObjectS<{
+        showImageText: Schema<boolean, boolean>;
+        showVideoUrl: Schema<boolean, boolean>;
+        showVideoFile: Schema<boolean, boolean>;
+    }>, Schemastery.ObjectT<{
+        showImageText: Schema<boolean, boolean>;
+        showVideoUrl: Schema<boolean, boolean>;
+        showVideoFile: Schema<boolean, boolean>;
+    }>>;
+    maxDescLength: Schema<number, number>;
+    timeout: Schema<number, number>;
+    ignoreSendError: Schema<boolean, boolean>;
+    enableForward: Schema<boolean, boolean>;
+    downloadVideoBeforeSend: Schema<boolean, boolean>;
+    messageBufferDelay: Schema<number, number>;
+    retryTimes: Schema<number, number>;
+    retryInterval: Schema<number, number>;
+    videoSendTimeout: Schema<number, number>;
+    autoClearCacheInterval: Schema<number, number>;
+}>>;
+export declare function apply(ctx: Context, config: any): void;

package/lib/index.js

@@ -12,6 +12,7 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const promises_1 = require("stream/promises");
 const worker_threads_1 = require("worker_threads");
+const currentFilePath = path_1.default.join(process.cwd(), 'src', 'index.ts');
 exports.name = 'video-parser-all';
 exports.Config = koishi_1.Schema.object({
     enable: koishi_1.Schema.boolean().default(true).description('【基础设置】启用插件'),
@@ -104,13 +105,9 @@ function extractUrl(content) {
     const urlMatches = content.match(/https?:\/\/[^\s]+/gi) || [];
     return urlMatches.filter(url => {
         const lower = url.toLowerCase();
-        return Object.values(PLATFORM_KEYWORDS).some(g => g.some(k => lower.includes(k)));
+        return Object.values(PLATFORM_KEYWORDS).some(group => group.some(keyword => lower.includes(keyword)));
     });
 }
-function hasPlatformKeyword(content) {
-    const lower = content.toLowerCase();
-    return Object.values(PLATFORM_KEYWORDS).some(g => g.some(k => lower.includes(k)));
-}
 function getPlatformType(url) {
     const lower = url.toLowerCase();
     if (PLATFORM_KEYWORDS.kuaishou.some(k => lower.includes(k)))
@@ -137,7 +134,8 @@ async function shortUrl(url) {
         if (res.data.code === 200)
             return res.data.short_url;
     }
-    catch { }
+    catch (error) {
+    }
     return url;
 }
 async function downloadVideoWithThreads(url, filename) {
@@ -146,10 +144,20 @@ async function downloadVideoWithThreads(url, filename) {
         if (!fs_1.default.existsSync(dir))
             fs_1.default.mkdirSync(dir, { recursive: true });
         const filePath = path_1.default.join(dir, `${filename}.mp4`);
-        const worker = new worker_threads_1.Worker(__filename, { workerData: { url, filePath } });
-        worker.on('message', (result) => result.success ? resolve(result.filePath) : reject(new Error(result.error)));
+        const worker = new worker_threads_1.Worker(currentFilePath, { workerData: { url, filePath } });
+        worker.on('message', (result) => {
+            if (result.success && result.filePath) {
+                resolve(result.filePath);
+            }
+            else {
+                reject(new Error(result.error || '下载失败'));
+            }
+        });
         worker.on('error', reject);
-        worker.on('exit', (code) => code !== 0 && reject(new Error('视频下载线程异常')));
+        worker.on('exit', (code) => {
+            if (code !== 0)
+                reject(new Error('视频下载线程异常'));
+        });
     });
 }
 function parseData(data, maxDescLength, platform) {
@@ -181,15 +189,12 @@ function parseData(data, maxDescLength, platform) {
         else if (Array.isArray(data.video_backup) && data.video_backup.length > 0) {
             video = data.video_backup[0]?.url || '';
         }
-        if (video && (video.endsWith('.m4a') || video.endsWith('.mp3'))) {
+        if (video && (video.endsWith('.m4a') || video.endsWith('.mp3')))
             video = '';
-        }
     }
     else if (platform === 'bilibili') {
         if (data.videos && Array.isArray(data.videos) && data.videos.length > 0) {
-            const hdVideo = data.videos.find(v => v.title.includes('1080') ||
-                (v.url && v.url.includes('192')) ||
-                v.index === 1);
+            const hdVideo = data.videos.find((v) => v.title.includes('1080') || (v.url && v.url.includes('192')) || v.index === 1);
             video = hdVideo?.url || data.videos[0]?.url || '';
         }
         else if (data.url) {
@@ -197,12 +202,7 @@ function parseData(data, maxDescLength, platform) {
         }
     }
     else {
-        if (data.url)
-            video = data.url;
-        else if (data.videos?.[0]?.url)
-            video = data.videos[0].url;
-        else if (data.video_backup?.[0]?.url)
-            video = data.video_backup[0].url;
+        video = data.url || data.videos?.[0]?.url || data.video_backup?.[0]?.url || '';
     }
     if (video.endsWith('.m4a') || video.endsWith('.mp3'))
         video = '';
@@ -210,17 +210,21 @@ function parseData(data, maxDescLength, platform) {
 }
 function clearAllCache() {
     processed.clear();
-    linkBuffer.forEach(b => clearTimeout(b.timer));
+    linkBuffer.forEach(buf => clearTimeout(buf.timer));
     linkBuffer.clear();
-    const d = path_1.default.join(process.cwd(), 'temp_videos');
-    if (fs_1.default.existsSync(d))
-        fs_1.default.readdirSync(d).forEach(f => { try {
-            fs_1.default.unlinkSync(path_1.default.join(d, f));
-        }
-        catch { } });
+    const tempDir = path_1.default.join(process.cwd(), 'temp_videos');
+    if (fs_1.default.existsSync(tempDir)) {
+        fs_1.default.readdirSync(tempDir).forEach(file => {
+            try {
+                fs_1.default.unlinkSync(path_1.default.join(tempDir, file));
+            }
+            catch (error) {
+            }
+        });
+    }
     return true;
 }
-const delay = (ms) => new Promise(r => setTimeout(r, ms));
+const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 function apply(ctx, config) {
     if (!worker_threads_1.isMainThread)
         return;
@@ -245,10 +249,9 @@ function apply(ctx, config) {
                         break;
                     }
                 }
-                catch (e) {
-                    if (retry === config.retryTimes) {
+                catch (error) {
+                    if (retry === config.retryTimes)
                         break;
-                    }
                     await delay(config.retryInterval);
                 }
             }
@@ -282,10 +285,9 @@ function apply(ctx, config) {
                         break;
                     }
                 }
-                catch (e) {
-                    if (retry === config.retryTimes) {
+                catch (error) {
+                    if (retry === config.retryTimes)
                         break;
-                    }
                     await delay(config.retryInterval);
                 }
             }
@@ -299,36 +301,54 @@ function apply(ctx, config) {
             return { data: null, msg: '请勿重复解析' };
         }
         processed.set(hash, now);
-        const r = await parse(url);
-        if (!r.data)
-            return { data: null, msg: r.msg };
-        const d = r.data;
+        const result = await parse(url);
+        if (!result.data)
+            return { data: null, msg: result.msg };
+        const parseData = result.data;
         let text = config.imageParseFormat
-            .replace(/\${标题}/g, d.title)
-            .replace(/\${UP主}/g, d.author)
-            .replace(/\${简介}/g, d.desc)
+            .replace(/\${标题}/g, parseData.title)
+            .replace(/\${UP主}/g, parseData.author)
+            .replace(/\${简介}/g, parseData.desc)
             .replace(/\${tab}/g, '\t')
             .replace(/\${~~~}/g, '\n');
-        return { data: { text, cover: d.cover, images: d.images, video: d.video, type: d.type }, msg: 'ok' };
+        return {
+            data: {
+                text,
+                cover: parseData.cover,
+                images: parseData.images,
+                video: parseData.video,
+                type: parseData.type
+            },
+            msg: 'ok'
+        };
     }
-    async function sendTimeout(session, c) {
-        if (config.videoSendTimeout <= 0)
-            return session.send(c).catch(() => null);
-        return Promise.race([session.send(c), new Promise((_, r) => setTimeout(() => r('timeout'), config.videoSendTimeout))]).catch(() => null);
+    async function sendTimeout(session, content) {
+        if (config.videoSendTimeout <= 0) {
+            return session.send(content).catch(() => null);
+        }
+        return Promise.race([
+            session.send(content),
+            new Promise((_, reject) => setTimeout(() => reject('timeout'), config.videoSendTimeout))
+        ]).catch(() => null);
     }
     async function flush(session, manualUrls) {
         const key = `${session.platform}:${session.userId}:${session.channelId}`;
-        const buf = linkBuffer.get(key);
-        const urls = manualUrls || buf?.urls || [];
-        if (buf) {
-            clearTimeout(buf.timer);
+        const buffer = linkBuffer.get(key);
+        const urls = manualUrls || buffer?.urls || [];
+        if (buffer) {
+            clearTimeout(buffer.timer);
             linkBuffer.delete(key);
         }
         const items = [];
         const errs = [];
-        for (const u of urls) {
-            const one = await processSingleUrl(session, u);
-            one.data ? items.push(one.data) : errs.push(`【${u.slice(0, 22)}...】：${one.msg}`);
+        for (const url of urls) {
+            const result = await processSingleUrl(session, url);
+            if (result.data) {
+                items.push(result.data);
+            }
+            else {
+                errs.push(`【${url.slice(0, 22)}...】：${result.msg}`);
+            }
         }
         const forwardMessages = [];
         const botName = '视频解析机器人';
@@ -358,41 +378,44 @@ function apply(ctx, config) {
             }
             return;
         }
-        for (const it of items) {
+        for (const item of items) {
             if (config.enableForward && session.platform === 'onebot') {
                 forwardMessages.push((0, koishi_1.h)('message', [
                     (0, koishi_1.h)('author', { id: session.selfId, name: botName }),
-                    it.text
+                    item.text
                 ]));
-                if (it.cover) {
+                if (item.cover) {
                     forwardMessages.push((0, koishi_1.h)('message', [
                         (0, koishi_1.h)('author', { id: session.selfId, name: botName }),
-                        koishi_1.h.image(it.cover)
+                        koishi_1.h.image(item.cover)
                     ]));
                 }
-                if (it.video && config.returnContent.showVideoFile) {
-                    let vid = koishi_1.h.video(it.video);
+                if (item.video && config.returnContent.showVideoFile) {
+                    let videoElem = koishi_1.h.video(item.video);
                     if (config.downloadVideoBeforeSend) {
                         try {
-                            const name = crypto_1.default.createHash('md5').update(it.video).digest('hex');
-                            vid = koishi_1.h.file(await downloadVideoWithThreads(it.video, name));
+                            const filename = crypto_1.default.createHash('md5').update(item.video).digest('hex');
+                            const filePath = await downloadVideoWithThreads(item.video, filename);
+                            videoElem = koishi_1.h.file(filePath);
+                        }
+                        catch (error) {
+                            videoElem = koishi_1.h.video(item.video);
                         }
-                        catch { }
                     }
                     forwardMessages.push((0, koishi_1.h)('message', [
                         (0, koishi_1.h)('author', { id: session.selfId, name: botName }),
-                        vid
+                        videoElem
                     ]));
                 }
-                if (it.video && config.returnContent.showVideoUrl) {
-                    const s = await shortUrl(it.video);
+                if (item.video && config.returnContent.showVideoUrl) {
+                    const shortLink = await shortUrl(item.video);
                     forwardMessages.push((0, koishi_1.h)('message', [
                         (0, koishi_1.h)('author', { id: session.selfId, name: botName }),
-                        `🔗 无水印：${s}`
+                        `🔗 无水印：${shortLink}`
                     ]));
                 }
-                if (it.type === 'image' && it.images?.length) {
-                    it.images.forEach(imgUrl => {
+                if (item.type === 'image' && item.images?.length) {
+                    item.images.forEach(imgUrl => {
                         forwardMessages.push((0, koishi_1.h)('message', [
                             (0, koishi_1.h)('author', { id: session.selfId, name: botName }),
                             koishi_1.h.image(imgUrl)
@@ -401,32 +424,35 @@ function apply(ctx, config) {
                 }
             }
             else {
-                await sendTimeout(session, it.text);
+                await sendTimeout(session, item.text);
                 await delay(300);
-                if (it.type === 'image' && it.images?.length) {
-                    const msg = (0, koishi_1.h)('message', ...it.images.map(u => koishi_1.h.image(u)));
-                    await sendTimeout(session, msg);
+                if (item.type === 'image' && item.images?.length) {
+                    const imgMsg = (0, koishi_1.h)('message', ...item.images.map(url => koishi_1.h.image(url)));
+                    await sendTimeout(session, imgMsg);
                 }
                 else {
-                    if (it.cover) {
-                        await sendTimeout(session, koishi_1.h.image(it.cover));
+                    if (item.cover) {
+                        await sendTimeout(session, koishi_1.h.image(item.cover));
                         await delay(300);
                     }
-                    if (it.video && config.returnContent.showVideoFile) {
-                        let vid = koishi_1.h.video(it.video);
+                    if (item.video && config.returnContent.showVideoFile) {
+                        let videoElem = koishi_1.h.video(item.video);
                         if (config.downloadVideoBeforeSend) {
                             try {
-                                const name = crypto_1.default.createHash('md5').update(it.video).digest('hex');
-                                vid = koishi_1.h.file(await downloadVideoWithThreads(it.video, name));
+                                const filename = crypto_1.default.createHash('md5').update(item.video).digest('hex');
+                                const filePath = await downloadVideoWithThreads(item.video, filename);
+                                videoElem = koishi_1.h.file(filePath);
+                            }
+                            catch (error) {
+                                videoElem = koishi_1.h.video(item.video);
                             }
-                            catch { }
                         }
-                        await sendTimeout(session, vid);
+                        await sendTimeout(session, videoElem);
                     }
-                    if (it.video && config.returnContent.showVideoUrl) {
+                    if (item.video && config.returnContent.showVideoUrl) {
                         await delay(300);
-                        const s = await shortUrl(it.video);
-                        await sendTimeout(session, `🔗 无水印：${s}`);
+                        const shortLink = await shortUrl(item.video);
+                        await sendTimeout(session, `🔗 无水印：${shortLink}`);
                     }
                 }
                 await delay(1000);
@@ -445,34 +471,34 @@ function apply(ctx, config) {
             return;
         const key = `${session.platform}:${session.userId}:${session.channelId}`;
         if (linkBuffer.has(key)) {
-            const b = linkBuffer.get(key);
-            const newUrls = urls.filter(u => !b.urls.includes(u));
+            const buffer = linkBuffer.get(key);
+            const newUrls = urls.filter(url => !buffer.urls.includes(url));
             if (newUrls.length) {
-                b.urls.push(...newUrls);
-                clearTimeout(b.timer);
-                b.timer = setTimeout(() => flush(session), config.messageBufferDelay * 1000);
+                buffer.urls.push(...newUrls);
+                clearTimeout(buffer.timer);
+                buffer.timer = setTimeout(() => flush(session, undefined), config.messageBufferDelay * 1000);
             }
             return;
         }
-        let tipId;
+        let tipMsgId;
         if (config.showWaitingTip) {
-            const m = await sendTimeout(session, config.waitingTipText);
-            tipId = m?.messageId || m?.id || m;
+            const msg = await sendTimeout(session, config.waitingTipText);
+            tipMsgId = msg?.messageId || msg?.id || msg;
         }
         linkBuffer.set(key, {
             urls,
-            timer: setTimeout(() => flush(session), config.messageBufferDelay * 1000),
-            tipMsgId: tipId
+            timer: setTimeout(() => flush(session, undefined), config.messageBufferDelay * 1000),
+            tipMsgId
         });
     });
     ctx.command('parse <url>', '手动解析视频链接')
         .action(async ({ session }, url) => {
         if (!url)
             return '请输入视频链接';
-        const us = extractUrl(url);
-        if (!us.length)
+        const urls = extractUrl(url);
+        if (!urls.length)
             return '不支持该链接';
-        await flush(session, us);
+        await flush(session, urls);
     });
     ctx.command('clear-cache', '清空解析缓存与临时文件')
         .action(() => {
@@ -481,20 +507,25 @@ function apply(ctx, config) {
     });
     setInterval(() => {
         const now = Date.now();
-        processed.forEach((t, h) => now - t > 86400000 && processed.delete(h));
+        processed.forEach((timestamp, hash) => {
+            if (now - timestamp > 86400000)
+                processed.delete(hash);
+        });
     }, 3600000);
     setInterval(() => {
-        const d = path_1.default.join(process.cwd(), 'temp_videos');
-        if (!fs_1.default.existsSync(d))
+        const tempDir = path_1.default.join(process.cwd(), 'temp_videos');
+        if (!fs_1.default.existsSync(tempDir))
             return;
         const now = Date.now();
-        fs_1.default.readdirSync(d).forEach(f => {
+        fs_1.default.readdirSync(tempDir).forEach(file => {
             try {
-                const st = fs_1.default.statSync(path_1.default.join(d, f));
-                if (now - st.mtimeMs > 3600000)
-                    fs_1.default.unlinkSync(path_1.default.join(d, f));
+                const stat = fs_1.default.statSync(path_1.default.join(tempDir, file));
+                if (now - stat.mtimeMs > 3600000) {
+                    fs_1.default.unlinkSync(path_1.default.join(tempDir, file));
+                }
+            }
+            catch (error) {
             }
-            catch { }
         });
     }, 1800000);
     if (config.autoClearCacheInterval > 0) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-video-parser-all",
   "description": "Koishi 全平台视频解析插件，支持抖音/快手/B站/小红书/微博/今日头条/皮皮搞笑/皮皮虾视频/图文链接解析",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [