fix: 修复获取html入口文件时，因为接口异常不能正常触发loadError生命周期 (#481)

Tencent · Mar 29, 2023 · 1b45d30 · 1b45d30
1 parent de3c490
commit 1b45d30
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/packages/wujie-core/src/constant.ts b/packages/wujie-core/src/constant.ts
@@ -40,5 +40,6 @@ export const WUJIE_TIPS_NO_FETCH = "window上不存在fetch属性，需要自行
 export const WUJIE_TIPS_NOT_SUPPORTED = "当前浏览器不支持无界，子应用将采用iframe方式渲染";
 export const WUJIE_TIPS_SCRIPT_ERROR_REQUESTED = "脚本请求出现错误";
 export const WUJIE_TIPS_CSS_ERROR_REQUESTED = "样式请求出现错误";
+export const WUJIE_TIPS_HTML_ERROR_REQUESTED = "html请求出现错误";
 export const WUJIE_TIPS_REPEAT_RENDER = "无界组件短时间重复渲染了两次，可能存在性能问题请检查代码";
 export const WUJIE_TIPS_NO_SCRIPT = "目标Script尚未准备好或已经被移除";
diff --git a/packages/wujie-core/src/entry.ts b/packages/wujie-core/src/entry.ts
@@ -6,7 +6,12 @@ import processTpl, {
   StyleObject,
 } from "./template";
 import { defaultGetPublicPath, getInlineCode, requestIdleCallback, error, compose, getCurUrl } from "./utils";
-import { WUJIE_TIPS_NO_FETCH, WUJIE_TIPS_SCRIPT_ERROR_REQUESTED, WUJIE_TIPS_CSS_ERROR_REQUESTED } from "./constant";
+import {
+  WUJIE_TIPS_NO_FETCH,
+  WUJIE_TIPS_SCRIPT_ERROR_REQUESTED,
+  WUJIE_TIPS_CSS_ERROR_REQUESTED,
+  WUJIE_TIPS_HTML_ERROR_REQUESTED,
+} from "./constant";
 import { getEffectLoaders, isMatchUrl } from "./plugin";
 import Wujie from "./sandbox";
 import { plugin, loadErrorHandler } from "./index";
@@ -211,14 +216,20 @@ export default function importHTML(params: {
   const getHtmlParseResult = (url, html, htmlLoader) =>
     (html
       ? Promise.resolve(html)
-      : fetch(url).then(
-          (response) => response.text(),
-          (e) => {
+      : fetch(url)
+          .then((response) => {
+            if (response.status >= 400) {
+              error(WUJIE_TIPS_HTML_ERROR_REQUESTED, { url, response });
+              loadError?.(url, new Error(WUJIE_TIPS_HTML_ERROR_REQUESTED));
+              return "";
+            }
+            return response.text();
+          })
+          .catch((e) => {
             embedHTMLCache[url] = null;
             loadError?.(url, e);
             return Promise.reject(e);
-          }
-        )
+          })
     ).then((html) => {
       const assetPublicPath = getPublicPath(url);
       const { template, scripts, styles } = processTpl(htmlLoader(html), assetPublicPath);