[组件-下载视频][插件-下载视频 - aria2 输出支持][组件-查看封面] 为aria2提供可下载封面的功能

registry/lib/components/video/download/DownloadVideo.vue

@@ -333,16 +333,14 @@ export default Vue.extend({
         }
         const action = new DownloadVideoAction(videoInfos)
         assets.forEach(a => {
-          action.extraAssets.push({
+          const assetsType = a?.getUrls ? action.extraOnlineAssets : action.extraAssets
+          assetsType.push({
             asset: a,
             instance: this.$refs.assetsOptions.find((c: any) => c.$attrs.name === a.name),
           })
         })
-        /** 若视频输出的插件设置了proxyExtraAssets，则由插件在runAction中处理 */
-        if (!output?.proxyExtraAssets) {
-          await action.downloadExtraAssets()
-        }
         await output.runAction(action, instance)
+        await action.downloadExtraAssets()
       } catch (error) {
         logError(error)
       } finally {

registry/lib/components/video/download/types.ts

@@ -86,8 +86,10 @@ export interface DownloadVideoAssets<AssetsParameter = any> extends VueInstanceI
 /** 表示视频的下载信息以及携带的额外产物 */
 export class DownloadVideoAction<AssetsParameter = any> {
   readonly inputs: DownloadVideoInputItem[] = []
-  /** 可下载的asset和对应的参数 */
+  /** 可调用处理的asset和对应的参数 */
   extraAssets: { asset: DownloadVideoAssets; instance: AssetsParameter }[] = []
+  /** 可直接下载的asset和对应的参数 */
+  extraOnlineAssets: { asset: DownloadVideoAssets; instance: AssetsParameter }[] = []
 
   constructor(public infos: DownloadVideoInfo[]) {
     this.inputs = infos.map(it => it.input)
@@ -101,7 +103,9 @@ export class DownloadVideoAction<AssetsParameter = any> {
     const { infos } = this
     const extraAssetsBlob = (
       await Promise.all(
-        this.extraAssets.map(({ asset, instance }) => asset.getAssets(infos, instance)),
+        [...this.extraAssets, ...this.extraOnlineAssets].map(({ asset, instance }) =>
+          asset.getAssets(infos, instance),
+        ),
       )
     ).flat()
     await new DownloadPackage(extraAssetsBlob).emit(filename)
@@ -110,7 +114,5 @@ export class DownloadVideoAction<AssetsParameter = any> {
 /** 下载视频的最终输出处理 */
 export interface DownloadVideoOutput<OutputParameter = any> extends VueInstanceInput, WithName {
   runAction: (action: DownloadVideoAction, instance: OutputParameter) => Promise<void>
-  /** 是否需要代理下载assets */
-  proxyExtraAssets?: boolean
   description?: string
 }

registry/lib/plugins/video/download/aria2-output/aria2-rpc.ts

@@ -2,10 +2,7 @@ import { getJson, monkey, postJson } from '@/core/ajax'
 import { Toast } from '@/core/toast'
 import { UserAgent } from '@/core/utils/constants'
 import { logError } from '@/core/utils/log'
-import {
-  DownloadVideoOutput,
-  DownloadVideoAction,
-} from '../../../../components/video/download/types'
+import { DownloadVideoOutput } from '../../../../components/video/download/types'
 import { Aria2RpcProfile } from './rpc-profiles'
 
 interface RpcParam {
@@ -130,15 +127,14 @@ export const aria2Rpc: DownloadVideoOutput = {
   name: 'aria2Rpc',
   displayName: 'aria2 RPC',
   description: '使用 aria2 RPC 功能发送下载请求.',
-  proxyExtraAssets: true,
   runAction: async (
     action,
     instance: Vue & {
       selectedRpcProfile: Aria2RpcProfile
       isPluginDownloadAssets?: boolean
     },
   ) => {
-    const { infos, extraAssets } = action
+    const { infos, extraOnlineAssets } = action
     const { selectedRpcProfile, isPluginDownloadAssets } = instance
     const { secretKey, dir, other } = selectedRpcProfile
     const referer = document.URL.replace(window.location.search, '')
@@ -175,24 +171,20 @@ export const aria2Rpc: DownloadVideoOutput = {
     // handle assets
     const assetsAriaParams = []
     const extraAssetsForBrowerDownload = []
-    for (const { asset, instance: assetInstance } of extraAssets) {
+    for (const { asset, instance: assetInstance } of extraOnlineAssets) {
       if (isPluginDownloadAssets && 'getUrls' in asset) {
         // get asset from aria2
         const results = await asset.getUrls(infos, assetInstance)
         assetsAriaParams.push(...results.map(({ name, url }) => ariaParamsGenerator(url, name)))
       } else {
-        // get asset from browser
+        // remain asset in `extraOnlineAssets`
         extraAssetsForBrowerDownload.push({ asset, instance: assetInstance })
       }
     }
+    action.extraOnlineAssets = extraAssetsForBrowerDownload
 
     const totalParams = [...videoParams, ...assetsAriaParams]
     const results = await sendRpc(selectedRpcProfile, totalParams)
-    if (extraAssetsForBrowerDownload.length > 0) {
-      const actionForBrowserDownload = new DownloadVideoAction(infos)
-      actionForBrowserDownload.extraAssets = extraAssetsForBrowerDownload
-      await actionForBrowserDownload.downloadExtraAssets()
-    }
     console.table(results)
     if (results.length === 1) {
       const result = results[0]