mlt131220/AstralView
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(goview): deepen iframe/video import heuristics

Browse Source
This commit is contained in:
clawdbot 2026-01-28 19:03:50 +08:00
parent 9ac5bbaa09
commit 00cfb9111d
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/sdk/src/core/goview/convert.ts
View File

@ -345,7 +345,7 @@ function looksLikeIframeOption(option: unknown): boolean {
if (containsVideoHtmlDeep(option, 2)) return false; if (containsVideoHtmlDeep(option, 2)) return false;
if ( if (
hasAnyKeyDeep(option, ['iframeUrl', 'iframeSrc', 'embedUrl', 'frameUrl', 'frameSrc'], 2) || hasAnyKeyDeep(option, ['iframeUrl', 'iframeSrc', 'embedUrl', 'frameUrl', 'frameSrc'], 3) ||
// Some exports store raw HTML instead of a URL. // Some exports store raw HTML instead of a URL.
hasAnyKeyDeep( hasAnyKeyDeep(
option, option,
@ -365,7 +365,7 @@ function looksLikeIframeOption(option: unknown): boolean {
'content', 'content',
'template', 'template',
], ],
2, 3,
) )
) { ) {
return true; return true;
@ -459,7 +459,7 @@ function looksLikeVideoOption(option: unknown): boolean {
'poster', 'poster',
'posterUrl', 'posterUrl',
], ],
2, 3,
) )
) { ) {
return true; return true;
@ -678,7 +678,7 @@ export function convertGoViewProjectToScreen(input: GoViewProjectLike | GoViewSt
const urlLike = pickUrlLike(option); const urlLike = pickUrlLike(option);
const urlLooksLikeEmbedPage = const urlLooksLikeEmbedPage =
!!urlLike && !!urlLike &&
/(youtube\.com|youtu\.be|vimeo\.com|bilibili\.com|youku\.com|iqiyi\.com|tencent|qq\.com|mgtv\.com|ixigua\.com|huya\.com|douyu\.com|twitch\.tv|douyin\.com|kuaishou\.com)/i.test( /(youtube\.com|youtu\.be|vimeo\.com|twitch\.tv|tiktok\.com|douyin\.com|kuaishou\.com|ixigua\.com|huya\.com|douyu\.com|bilibili\.com|live\.bilibili\.com|player\.bilibili\.com|youku\.com|iqiyi\.com|mgtv\.com|tencent|qq\.com|music\.163\.com)/i.test(
urlLike, urlLike,
) && ) &&
// Keep actual media URLs as video. // Keep actual media URLs as video.

10
packages/sdk/src/core/widgets/iframe.ts
View File

@ -178,7 +178,7 @@ function pickSrc(option: GoViewIframeOption): string {
obj.template; obj.template;
return typeof v === 'string' ? v : undefined; return typeof v === 'string' ? v : undefined;
}, },
2, 3,
); );
if (html) return toDataHtmlUrl(html); if (html) return toDataHtmlUrl(html);
@ -192,7 +192,7 @@ function pickSrc(option: GoViewIframeOption): string {
} }
return undefined; return undefined;
}, },
2, 3,
); );
if (!listUrl) return ''; if (!listUrl) return '';
@ -216,7 +216,7 @@ function pickFit(option: GoViewIframeOption): IframeWidgetNode['props']['fit'] |
function pickAspectRatio(option: GoViewIframeOption): number | undefined { function pickAspectRatio(option: GoViewIframeOption): number | undefined {
const direct = toMaybeNumber(option.aspectRatio ?? option.ratio); const direct = toMaybeNumber(option.aspectRatio ?? option.ratio);
if (direct !== undefined && direct > 0) return direct; if (direct !== undefined && direct > 0) return direct;
const nested = pickFromNested(option, (obj) => toMaybeNumber(obj.aspectRatio ?? obj.aspect ?? obj.ratio), 2); const nested = pickFromNested(option, (obj) => toMaybeNumber(obj.aspectRatio ?? obj.aspect ?? obj.ratio), 3);
if (nested !== undefined && nested > 0) return nested; if (nested !== undefined && nested > 0) return nested;
return undefined; return undefined;
} }
@ -237,14 +237,14 @@ function pickStringLike(option: GoViewIframeOption, keys: string[]): string | un
} }
return undefined; return undefined;
}, },
2, 3,
); );
} }
function pickBorderRadius(option: GoViewIframeOption): number | undefined { function pickBorderRadius(option: GoViewIframeOption): number | undefined {
const direct = toMaybeNumber(option.borderRadius); const direct = toMaybeNumber(option.borderRadius);
if (direct !== undefined) return direct; if (direct !== undefined) return direct;
return pickFromNested(option, (obj) => toMaybeNumber(obj.borderRadius ?? obj.radius ?? obj.r), 2); return pickFromNested(option, (obj) => toMaybeNumber(obj.borderRadius ?? obj.radius ?? obj.r), 3);
} }
export function convertGoViewIframeOptionToNodeProps(option: GoViewIframeOption): IframeWidgetNode['props'] { export function convertGoViewIframeOptionToNodeProps(option: GoViewIframeOption): IframeWidgetNode['props'] {

14
packages/sdk/src/core/widgets/video.ts
View File

@ -226,7 +226,7 @@ function pickSrc(option: GoViewVideoOption): string {
} }
return undefined; return undefined;
}, },
2, 3,
); );
if (fromDirect) return normalizeSrcMaybeFromHtml(fromDirect); if (fromDirect) return normalizeSrcMaybeFromHtml(fromDirect);
@ -240,7 +240,7 @@ function pickSrc(option: GoViewVideoOption): string {
} }
return undefined; return undefined;
}, },
2, 3,
); );
if (fromList) return normalizeSrcMaybeFromHtml(fromList); if (fromList) return normalizeSrcMaybeFromHtml(fromList);
@ -258,7 +258,7 @@ function pickBorderRadius(option: GoViewVideoOption): number | undefined {
const direct = toMaybeNumber(option.borderRadius); const direct = toMaybeNumber(option.borderRadius);
if (direct !== undefined) return direct; if (direct !== undefined) return direct;
return pickFromNested(option, (obj) => toMaybeNumber(obj.borderRadius ?? obj.radius ?? obj.r), 2); return pickFromNested(option, (obj) => toMaybeNumber(obj.borderRadius ?? obj.radius ?? obj.r), 3);
} }
function pickBooleanLike(option: GoViewVideoOption, keys: string[]): boolean | undefined { function pickBooleanLike(option: GoViewVideoOption, keys: string[]): boolean | undefined {
@ -271,7 +271,7 @@ function pickBooleanLike(option: GoViewVideoOption, keys: string[]): boolean | u
} }
return undefined; return undefined;
}, },
2, 3,
); );
} }
@ -295,7 +295,7 @@ function pickFitFromNested(option: GoViewVideoOption): string {
const direct = asString(option.fit) || asString(option.objectFit); const direct = asString(option.fit) || asString(option.objectFit);
if (direct) return direct; if (direct) return direct;
const nested = pickFromNested(option, (obj) => asString(obj.fit) || asString(obj.objectFit), 2); const nested = pickFromNested(option, (obj) => asString(obj.fit) || asString(obj.objectFit), 3);
return nested ?? ''; return nested ?? '';
} }
@ -350,14 +350,14 @@ function pickPoster(option: GoViewVideoOption): string | undefined {
} }
return undefined; return undefined;
}, },
2, 3,
); );
} }
function pickAspectRatio(option: GoViewVideoOption): number | undefined { function pickAspectRatio(option: GoViewVideoOption): number | undefined {
const direct = toMaybeNumber(option.aspectRatio ?? option.ratio); const direct = toMaybeNumber(option.aspectRatio ?? option.ratio);
if (direct !== undefined && direct > 0) return direct; if (direct !== undefined && direct > 0) return direct;
const nested = pickFromNested(option, (obj) => toMaybeNumber(obj.aspectRatio ?? obj.aspect ?? obj.ratio), 2); const nested = pickFromNested(option, (obj) => toMaybeNumber(obj.aspectRatio ?? obj.aspect ?? obj.ratio), 3);
if (nested !== undefined && nested > 0) return nested; if (nested !== undefined && nested > 0) return nested;
return undefined; return undefined;
} }