@blocklet/launcher-workflow 2.4.7 → 2.4.8

package/es/components/launch-serverless/allocate.js

@@ -6,7 +6,8 @@ import { LAUNCH_STATUS } from '@blocklet/launcher-util/lib/constant';
 import { useLocaleContext } from '../../contexts/locale';
 import useRequest from '../../contexts/request';
 import BaseServerlessLayout from './shared/base-serverless-layout';
-import { useDisplayProgress, useElapsedTime, useFormatTime } from './shared/common-components';
+import { useFormatTime } from './shared/common-components';
+import useWorkflowProgress from './shared/use-workflow-progress';
 import LoadingDisplayLayout from './shared/loading-display-layout';
 import RetryErrorMessage from './shared/retry-error-message';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -27,8 +28,6 @@ export default function LaunchServerless({
     error: '',
     launchSession: null
   });
-  const formatTime = useFormatTime();
-  const time = useElapsedTime(0);
   const actions = useMemo(() => {
     // 基础步骤时间
     const steps = [{
@@ -66,7 +65,21 @@ export default function LaunchServerless({
   const estimatedTime = useMemo(() => {
     return actions.reduce((acc, action) => acc + action.time, 0);
   }, [actions]);
-  const displayProgress = useDisplayProgress(0, estimatedTime);
+  const formatTime = useFormatTime();
+  const {
+    time,
+    displayProgress
+  } = useWorkflowProgress({
+    sessionId,
+    pageName: 'allocate',
+    estimatedTime,
+    isCompleted: state.allocated
+  });
+  useEffect(() => {
+    if (displayProgress >= 99 && state.allocated) {
+      navigate(`/install/${sessionId}${window.location.search || ''}`);
+    }
+  }, [displayProgress, state.allocated, sessionId, navigate]);
 
   // 根据当前进度获取对应的 action
   const getCurrentAction = progress => {
@@ -76,6 +89,7 @@ export default function LaunchServerless({
     return action?.message || actions[actions.length - 1].message;
   };
   useEffect(() => {
+    const timersRef = timerRef;
     const fetch = async () => {
       try {
         const {
@@ -94,7 +108,7 @@ export default function LaunchServerless({
           await Promise.all([api.post('/serverless/allocate', {
             launchId: sessionId
           }), new Promise(resolve => {
-            timerRef.current.raceTimer = setTimeout(() => {
+            timersRef.current.raceTimer = setTimeout(() => {
               resolve();
             }, estimatedTime * 1000);
           })]);
@@ -112,7 +126,7 @@ export default function LaunchServerless({
       }
     };
     if (window.blocklet.DEVELOPER_WORKFLOW_UI) {
-      timerRef.current.mockTimer = setTimeout(() => {
+      timersRef.current.mockTimer = setTimeout(() => {
         navigate(`/install/${sessionId}${window.location.search || ''}`);
       }, 5000);
     } else {
@@ -122,17 +136,7 @@ export default function LaunchServerless({
       const timers = Object.values(timerRef.current); // eslint-disable-line react-hooks/exhaustive-deps
       timers.forEach(timer => clearTimeout(timer));
     };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  useEffect(() => {
-    if (state.allocated) {
-      const timer = setTimeout(() => {
-        navigate(`/install/${sessionId}${window.location.search || ''}`);
-      }, 1000);
-      return () => clearTimeout(timer);
-    }
-    return () => {};
-  }, [state.allocated, sessionId, navigate]);
+  }, [api, estimatedTime, navigate, sessionId, setState]);
   const handleRetry = async () => {
     try {
       setState({

package/es/components/launch-serverless/install.js

@@ -7,7 +7,8 @@ import { useLocaleContext } from '../../contexts/locale';
 import useRequest from '../../contexts/request';
 import useSerialPolling from '../../hooks/use-serial-polling';
 import BaseServerlessLayout from './shared/base-serverless-layout';
-import { calculateEstimatedTime, useDisplayProgress, useElapsedTime, useFormatTime } from './shared/common-components';
+import { calculateEstimatedTime, useFormatTime } from './shared/common-components';
+import useWorkflowProgress from './shared/use-workflow-progress';
 import LoadingDisplayLayout from './shared/loading-display-layout';
 import RetryErrorMessage from './shared/retry-error-message';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -80,6 +81,20 @@ export default function LaunchServerless({
       time
     }) => acc + time, 0) + Math.ceil(additionalTime * 0.6);
   }, [actions]);
+  const {
+    time,
+    displayProgress
+  } = useWorkflowProgress({
+    sessionId,
+    pageName: 'install',
+    estimatedTime,
+    isCompleted: state.status === STATUS.installed
+  });
+  useEffect(() => {
+    if (displayProgress >= 99 && state.status === STATUS.installed) {
+      navigate(`/start-app/${sessionId}${window.location.search || ''}`);
+    }
+  }, [displayProgress, state.status, sessionId, navigate]);
 
   // 根据当前进度获取对应的 action
   const getCurrentAction = progress => {
@@ -88,18 +103,6 @@ export default function LaunchServerless({
     }) => progress >= start && progress < end);
     return action?.message || actions[actions.length - 1].message;
   };
-
-  // 时间管理 - 参考 launch-dedicated.js
-  let installStartTime = sessionStorage.getItem(`launcher-install-${sessionId}-time`);
-  if (!installStartTime) {
-    installStartTime = Date.now();
-    sessionStorage.setItem(`launcher-install-${sessionId}-time`, installStartTime);
-  }
-  const time = useElapsedTime(Math.round((Date.now() - installStartTime) / 1000));
-  const startProgress = useMemo(() => {
-    return Math.min(time / estimatedTime * 100, 90);
-  }, [time, estimatedTime]);
-  const displayProgress = useDisplayProgress(startProgress, state.status === STATUS.installed ? Math.min(estimatedTime - time, 2) : estimatedTime);
   const checkLaunchSession = async () => {
     if (window.blocklet.DEVELOPER_WORKFLOW_UI) {
       // 开发模式下的模拟逻辑
@@ -107,7 +110,6 @@ export default function LaunchServerless({
         setState({
           status: STATUS.installed
         });
-        sessionStorage.removeItem(`launcher-install-${sessionId}-time`);
         navigate(`/start-app/${sessionId}${window.location.search || ''}`);
       }, 47000);
       return;
@@ -123,7 +125,6 @@ export default function LaunchServerless({
       } = launchSession.metadata;
       const hasInstalled = ['starting', 'installed', 'running', 'stopped'].includes(status) || launchSession.running || launchSession.status >= LAUNCH_STATUS.consuming;
       if (hasInstalled) {
-        sessionStorage.removeItem(`launcher-install-${sessionId}-time`);
         setState({
           status: STATUS.installed
         });
@@ -152,7 +153,6 @@ export default function LaunchServerless({
           retryCount: state.retryCount + 1
         });
       } else {
-        sessionStorage.removeItem(`launcher-install-${sessionId}-time`);
         setState({
           error: error.message,
           status: STATUS.error,
@@ -168,18 +168,7 @@ export default function LaunchServerless({
     interval: CHECK_INTERVAL,
     onPoll: checkLaunchSession
   });
-  useEffect(() => {
-    if (state.status === STATUS.installed && displayProgress >= 99) {
-      const timer = setTimeout(() => {
-        sessionStorage.removeItem(`launcher-install-${sessionId}-time`);
-        navigate(`/start-app/${sessionId}${window.location.search || ''}`);
-      }, 1500);
-      return () => clearTimeout(timer);
-    }
-    return () => {};
-  }, [state.status, sessionId, navigate, displayProgress]);
   const handleRetry = () => {
-    sessionStorage.removeItem(`launcher-install-${sessionId}-time`);
     navigate(`/launch/${sessionId}${window.location.search || ''}`);
   };
   return /*#__PURE__*/_jsxs(BaseServerlessLayout, {

package/es/components/launch-serverless/shared/common-components.js

@@ -163,9 +163,9 @@ export function useDisplayProgress(start, duration = 5) {
     setProgress(prev => Math.max(prev, start));
   }, [start]);
   useEffect(() => {
-    const timerDuration = Math.round((duration || 1) * 1000 / 99);
+    const timerDuration = Math.round((duration || 1) * 1000 / 100);
     const interval = setInterval(() => {
-      setProgress(prev => Math.min(prev + 1, 99));
+      setProgress(prev => Math.min(prev + 1, 100));
     }, timerDuration);
     return () => clearInterval(interval);
   }, [duration]);

package/es/components/launch-serverless/shared/retry-error-message.js

@@ -10,6 +10,7 @@ import React, { useState } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 export default function RetryErrorMessage({
   title,
+  desc = '',
   onRetry,
   retryText
 }) {
@@ -25,9 +26,13 @@ export default function RetryErrorMessage({
     setIsLoading(false);
   };
   return /*#__PURE__*/_jsx(LaunchResultMessage, {
+    style: {
+      marginTop: '20vh'
+    },
     variant: "error",
     title: title,
-    footer: /*#__PURE__*/_jsx(Button, {
+    subTitle: desc,
+    footer: onRetry && /*#__PURE__*/_jsx(Button, {
       size: "small",
       style: {
         marginTop: '-16px'
@@ -40,6 +45,7 @@ export default function RetryErrorMessage({
 }
 RetryErrorMessage.propTypes = {
   title: PropTypes.string.isRequired,
+  desc: PropTypes.string,
   onRetry: PropTypes.func.isRequired,
   retryText: PropTypes.string.isRequired
 };

package/es/components/launch-serverless/shared/use-workflow-progress.js

@@ -0,0 +1,184 @@
+import { useEffect, useMemo, useRef, useState } from 'react';
+import { useDisplayProgress, useElapsedTime } from './common-components';
+const CACHE_KEY = 'launcher-workflow';
+const CACHE_EXPIRE_DAYS = 3;
+
+/**
+ * 工作流进度管理 Hook
+ * @param {Object} options
+ * @param {string} options.sessionId - 会话ID
+ * @param {string} options.pageName - 页面名称，用于缓存标识
+ * @param {number} options.estimatedTime - 预计完成时间（秒）
+ * @param {boolean} options.isCompleted - 是否已完成
+ * @param {number} [options.initialStartTime] - 初始开始时间
+ * @returns {Object} 进度相关数据
+ */
+export default function useWorkflowProgress({
+  sessionId,
+  pageName,
+  estimatedTime,
+  isCompleted,
+  initialStartTime = Date.now()
+}) {
+  // 缓存操作函数
+  const cache = useMemo(() => {
+    const getWorkflowCache = () => {
+      try {
+        return JSON.parse(localStorage.getItem(CACHE_KEY) || '{}');
+      } catch (error) {
+        return {};
+      }
+    };
+    const setWorkflowCache = data => {
+      try {
+        localStorage.setItem(CACHE_KEY, JSON.stringify(data));
+      } catch (error) {
+        console.error('Failed to save cache:', error);
+      }
+    };
+    return {
+      get: () => {
+        try {
+          const allCache = getWorkflowCache();
+          const sessionCache = allCache[sessionId] || {};
+          const pageCache = sessionCache[pageName];
+          if (!pageCache) return null;
+          const {
+            startTime,
+            progress,
+            expireTime
+          } = pageCache;
+
+          // 检查是否过期
+          if (expireTime && expireTime < Date.now()) {
+            // 删除过期缓存
+            delete sessionCache[pageName];
+            allCache[sessionId] = sessionCache;
+            setWorkflowCache(allCache);
+            return null;
+          }
+          return {
+            startTime,
+            progress
+          };
+        } catch (error) {
+          console.error('Failed to get cache:', error);
+          return null;
+        }
+      },
+      save: (currentStartTime, progress) => {
+        try {
+          const allCache = getWorkflowCache();
+          const sessionCache = allCache[sessionId] || {};
+          const expireTime = Date.now() + CACHE_EXPIRE_DAYS * 24 * 60 * 60 * 1000;
+          sessionCache[pageName] = {
+            startTime: currentStartTime,
+            progress,
+            expireTime
+          };
+          allCache[sessionId] = sessionCache;
+          setWorkflowCache(allCache);
+        } catch (error) {
+          console.error('Failed to save cache:', error);
+        }
+      },
+      clear: () => {
+        try {
+          const allCache = getWorkflowCache();
+          if (allCache[sessionId]) {
+            delete allCache[sessionId];
+            setWorkflowCache(allCache);
+          }
+        } catch (error) {
+          console.error('Failed to clear cache:', error);
+        }
+      },
+      // 清理所有过期缓存
+      cleanExpired: () => {
+        try {
+          const allCache = getWorkflowCache();
+          const now = Date.now();
+          let hasExpired = false;
+
+          // 遍历所有会话
+          Object.keys(allCache).forEach(sid => {
+            const sessionCache = allCache[sid];
+            // 遍历会话中的所有页面缓存
+            Object.keys(sessionCache).forEach(page => {
+              if (sessionCache[page].expireTime < now) {
+                delete sessionCache[page];
+                hasExpired = true;
+              }
+            });
+            // 如果会话没有页面缓存了，删除会话
+            if (Object.keys(sessionCache).length === 0) {
+              delete allCache[sid];
+            }
+          });
+          if (hasExpired) {
+            setWorkflowCache(allCache);
+          }
+        } catch (error) {
+          console.error('Failed to clean expired cache:', error);
+        }
+      }
+    };
+  }, [sessionId, pageName]);
+
+  // 从缓存获取开始时间
+  const startTimeRef = useRef();
+  startTimeRef.current = useMemo(() => {
+    if (startTimeRef.current) return startTimeRef.current;
+    const cached = cache.get();
+    return cached?.startTime || initialStartTime;
+  }, [cache, initialStartTime]);
+  const startTime = startTimeRef.current;
+  // 计算已经过去的时间
+  const time = useElapsedTime(Math.round((Date.now() - startTime) / 1000));
+
+  // 计算开始进度
+  const progressRef = useRef();
+  progressRef.current = useMemo(() => {
+    if (progressRef.current) return progressRef.current;
+    if (isCompleted) return 100;
+    const cached = cache.get();
+    if (cached?.progress) {
+      return Math.max(cached.progress, Math.min(time / estimatedTime * 100, 100));
+    }
+    return Math.min(time / estimatedTime * 100, 100);
+  }, [cache, time, estimatedTime, isCompleted]);
+  const startProgress = progressRef.current;
+
+  // 自动保存进度
+  const [lastSaveTime, setLastSaveTime] = useState(Date.now());
+  useEffect(() => {
+    if (isCompleted) {
+      cache.save(startTime, 100);
+      return undefined;
+    }
+    const saveTimer = setInterval(() => {
+      const now = Date.now();
+      // 每秒最多保存一次
+      if (now - lastSaveTime >= 1000) {
+        cache.save(startTime, startProgress);
+        setLastSaveTime(now);
+      }
+    }, 1000);
+    return () => {
+      clearInterval(saveTimer);
+      if (!isCompleted) {
+        cache.save(startTime, startProgress);
+      }
+    };
+  }, [cache, isCompleted, startProgress, lastSaveTime, startTime]);
+
+  // 使用进度显示 hook
+  const displayProgress = useDisplayProgress(startProgress, isCompleted ? Math.min(estimatedTime - time, 2) : estimatedTime);
+  return {
+    time: isCompleted ? Math.round((Date.now() - startTime) / 1000) : time,
+    startTime,
+    displayProgress,
+    startProgress,
+    cleanExpiredCache: cache.cleanExpired
+  };
+}

package/es/components/launch-serverless/start-app.js

@@ -1,6 +1,6 @@
 import { useSetState } from 'ahooks';
 import PropTypes from 'prop-types';
-import React, { useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo, useCallback } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { LAUNCH_STATUS } from '@blocklet/launcher-util/es/constant';
 import { useLocaleContext } from '../../contexts/locale';
@@ -8,7 +8,8 @@ import useRequest from '../../contexts/request';
 import useSerialPolling from '../../hooks/use-serial-polling';
 import { checkBlockletAccessible, getBlockletUrls, sortUrls, waitingForRaceAccessible } from '../../util';
 import BaseServerlessLayout from './shared/base-serverless-layout';
-import { AppSuccessDisplay, calculateEstimatedTime, useDisplayProgress, useElapsedTime, useFormatTime } from './shared/common-components';
+import { AppSuccessDisplay, calculateEstimatedTime, useFormatTime } from './shared/common-components';
+import useWorkflowProgress from './shared/use-workflow-progress';
 import LoadingDisplayLayout from './shared/loading-display-layout';
 import RetryErrorMessage from './shared/retry-error-message';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -33,12 +34,12 @@ export default function LaunchServerless({
     accessibleUrl: null,
     urls: [],
     error: '',
+    hiddenRetry: false,
     startTime: 0,
     hasTryStart: false,
     retryRequestCount: 0
   });
   const formatTime = useFormatTime();
-  const time = useElapsedTime(0);
   const actions = useMemo(() => {
     // 基础步骤时间
     const steps = [{
@@ -84,7 +85,16 @@ export default function LaunchServerless({
     const additionalTime = calculateEstimatedTime(components);
     return actions.reduce((acc, action) => acc + action.time, 0) + additionalTime;
   }, [actions]);
-  const displayProgress = useDisplayProgress(0, state.started ? 1 : estimatedTime);
+  const {
+    time,
+    displayProgress,
+    cleanExpiredCache
+  } = useWorkflowProgress({
+    sessionId,
+    pageName: 'start-app',
+    estimatedTime,
+    isCompleted: state.started
+  });
 
   // 根据当前进度获取对应的 action
   const getCurrentAction = progress => {
@@ -102,24 +112,30 @@ export default function LaunchServerless({
       return null;
     }
   };
-  const getUrls = async blocklet => {
+  const getUrls = useCallback(async blocklet => {
     let {
       urls
     } = state;
+    const {
+      launchSession
+    } = state;
     if (urls.length === 0) {
       urls = getBlockletUrls({
-        blocklet
+        blocklet: blocklet || launchSession?.blocklet || {}
       });
-      const sortedUrls = await sortUrls(urls);
-      urls = sortedUrls;
+      const defaultUrl = launchSession?.appUrl || launchSession?.appInfo?.appUrl;
       if (urls.length > 0) {
-        setState({
-          urls
-        });
+        const sortedUrls = await sortUrls(urls);
+        urls = sortedUrls;
+      } else if (defaultUrl) {
+        urls = [defaultUrl];
       }
+      setState({
+        urls
+      });
     }
     return urls;
-  };
+  }, [state, setState]);
   const checkLaunchSession = async () => {
     try {
       const {
@@ -205,7 +221,17 @@ export default function LaunchServerless({
   // 检查可用性 url
   const checkAccessibleUrls = async () => {
     try {
-      const urls = await getUrls(state.launchSession.blocklet);
+      const urls = await getUrls();
+      if (urls.length === 0) {
+        setState({
+          error: 'noAppUrl',
+          hiddenRetry: true,
+          starting: false,
+          checkingBlockletStatus: false,
+          checkingAccessible: false
+        });
+        return;
+      }
       const accessibleUrl = await checkOneAccessibleUrl(urls);
       setState(prev => {
         const obj = accessibleUrl ? {
@@ -271,7 +297,7 @@ export default function LaunchServerless({
               started: false,
               checkingBlockletStatus: false,
               checkingAccessible: false,
-              error: t('startApp.installFailed')
+              error: 'installFailed'
             };
           });
         }
@@ -281,14 +307,14 @@ export default function LaunchServerless({
             fetch(tryCount - 1);
           }, 1000);
         } else {
+          console.error('get launch session error', error);
           setState({
-            error: error.message,
+            error: 'installFailed',
             starting: false,
             checkingBlockletStatus: false,
             checkingAccessible: false
           });
         }
-        console.error('get launch session error', error);
       }
     };
     if (window.blocklet.DEVELOPER_WORKFLOW_UI) {
@@ -322,12 +348,16 @@ export default function LaunchServerless({
       window.location.reload();
     }
   };
-  const showLoading = state.starting || displayProgress < 99;
-  const showSuccess = !showLoading && state.started && state.launchSession && displayProgress >= 99;
-  const showError = !showLoading && !showSuccess && state.error;
-  if (showError) {
-    console.error('showError', state.error);
-  }
+  const showError = !!state.error;
+  const showSuccess = !showError && state.started && state.launchSession && displayProgress >= 99;
+  const showLoading = !state.error && !showSuccess;
+
+  // 在成功页面清理缓存
+  useEffect(() => {
+    if (showSuccess) {
+      cleanExpiredCache();
+    }
+  }, [showSuccess, cleanExpiredCache]);
   return /*#__PURE__*/_jsxs(BaseServerlessLayout, {
     title: t('startApp.pageTitle'),
     children: [showLoading && /*#__PURE__*/_jsx(LoadingDisplayLayout, {
@@ -346,7 +376,8 @@ export default function LaunchServerless({
       urls: state.urls
     }), showError && /*#__PURE__*/_jsx(RetryErrorMessage, {
       title: t('startApp.startFailed'),
-      onRetry: handleRetry,
+      desc: state.error && state.error !== 'installFailed' ? t(`startApp.error.${state.error}`) : '',
+      onRetry: state.hiddenRetry ? null : handleRetry,
       retryText: t('common.retry')
     })]
   });

package/es/locales/en.js

@@ -124,6 +124,9 @@ export default {
       creatingSecurityRules: 'Creating default security rules...',
       assigningDomain: 'Assigning default domain name...',
       waitingForDomain: 'Waiting for default domain name...'
+    },
+    error: {
+      noAppUrl: 'No accessible URL found, please contact the administrator'
     }
   },
   loading: {

package/es/locales/zh.js

@@ -123,6 +123,9 @@ export default {
       creatingSecurityRules: '正在创建默认安全规则...',
       assigningDomain: '正在为 Blocklet 分配默认域名...',
       waitingForDomain: '正在等待默认域名生效...'
+    },
+    error: {
+      noAppUrl: '没有发现 Blocklet 的访问地址，请联系管理员'
     }
   },
   loading: {

package/lib/components/launch-serverless/allocate.js

@@ -13,6 +13,7 @@ var _locale = require("../../contexts/locale");
 var _request = _interopRequireDefault(require("../../contexts/request"));
 var _baseServerlessLayout = _interopRequireDefault(require("./shared/base-serverless-layout"));
 var _commonComponents = require("./shared/common-components");
+var _useWorkflowProgress = _interopRequireDefault(require("./shared/use-workflow-progress"));
 var _loadingDisplayLayout = _interopRequireDefault(require("./shared/loading-display-layout"));
 var _retryErrorMessage = _interopRequireDefault(require("./shared/retry-error-message"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -41,8 +42,6 @@ function LaunchServerless(_ref) {
     error: '',
     launchSession: null
   });
-  const formatTime = (0, _commonComponents.useFormatTime)();
-  const time = (0, _commonComponents.useElapsedTime)(0);
   const actions = (0, _react.useMemo)(() => {
     // 基础步骤时间
     const steps = [{
@@ -79,7 +78,21 @@ function LaunchServerless(_ref) {
   const estimatedTime = (0, _react.useMemo)(() => {
     return actions.reduce((acc, action) => acc + action.time, 0);
   }, [actions]);
-  const displayProgress = (0, _commonComponents.useDisplayProgress)(0, estimatedTime);
+  const formatTime = (0, _commonComponents.useFormatTime)();
+  const {
+    time,
+    displayProgress
+  } = (0, _useWorkflowProgress.default)({
+    sessionId,
+    pageName: 'allocate',
+    estimatedTime,
+    isCompleted: state.allocated
+  });
+  (0, _react.useEffect)(() => {
+    if (displayProgress >= 99 && state.allocated) {
+      navigate("/install/".concat(sessionId).concat(window.location.search || ''));
+    }
+  }, [displayProgress, state.allocated, sessionId, navigate]);
 
   // 根据当前进度获取对应的 action
   const getCurrentAction = progress => {
@@ -92,6 +105,7 @@ function LaunchServerless(_ref) {
     return (action === null || action === void 0 ? void 0 : action.message) || actions[actions.length - 1].message;
   };
   (0, _react.useEffect)(() => {
+    const timersRef = timerRef;
     const fetch = async () => {
       try {
         const {
@@ -110,7 +124,7 @@ function LaunchServerless(_ref) {
           await Promise.all([api.post('/serverless/allocate', {
             launchId: sessionId
           }), new Promise(resolve => {
-            timerRef.current.raceTimer = setTimeout(() => {
+            timersRef.current.raceTimer = setTimeout(() => {
               resolve();
             }, estimatedTime * 1000);
           })]);
@@ -128,7 +142,7 @@ function LaunchServerless(_ref) {
       }
     };
     if (window.blocklet.DEVELOPER_WORKFLOW_UI) {
-      timerRef.current.mockTimer = setTimeout(() => {
+      timersRef.current.mockTimer = setTimeout(() => {
         navigate("/install/".concat(sessionId).concat(window.location.search || ''));
       }, 5000);
     } else {
@@ -138,17 +152,7 @@ function LaunchServerless(_ref) {
       const timers = Object.values(timerRef.current); // eslint-disable-line react-hooks/exhaustive-deps
       timers.forEach(timer => clearTimeout(timer));
     };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  (0, _react.useEffect)(() => {
-    if (state.allocated) {
-      const timer = setTimeout(() => {
-        navigate("/install/".concat(sessionId).concat(window.location.search || ''));
-      }, 1000);
-      return () => clearTimeout(timer);
-    }
-    return () => {};
-  }, [state.allocated, sessionId, navigate]);
+  }, [api, estimatedTime, navigate, sessionId, setState]);
   const handleRetry = async () => {
     try {
       var _state$launchSession;

package/lib/components/launch-serverless/install.js

@@ -14,6 +14,7 @@ var _request = _interopRequireDefault(require("../../contexts/request"));
 var _useSerialPolling = _interopRequireDefault(require("../../hooks/use-serial-polling"));
 var _baseServerlessLayout = _interopRequireDefault(require("./shared/base-serverless-layout"));
 var _commonComponents = require("./shared/common-components");
+var _useWorkflowProgress = _interopRequireDefault(require("./shared/use-workflow-progress"));
 var _loadingDisplayLayout = _interopRequireDefault(require("./shared/loading-display-layout"));
 var _retryErrorMessage = _interopRequireDefault(require("./shared/retry-error-message"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -97,6 +98,20 @@ function LaunchServerless(_ref) {
       return acc + time;
     }, 0) + Math.ceil(additionalTime * 0.6);
   }, [actions]);
+  const {
+    time,
+    displayProgress
+  } = (0, _useWorkflowProgress.default)({
+    sessionId,
+    pageName: 'install',
+    estimatedTime,
+    isCompleted: state.status === STATUS.installed
+  });
+  (0, _react.useEffect)(() => {
+    if (displayProgress >= 99 && state.status === STATUS.installed) {
+      navigate("/start-app/".concat(sessionId).concat(window.location.search || ''));
+    }
+  }, [displayProgress, state.status, sessionId, navigate]);
 
   // 根据当前进度获取对应的 action
   const getCurrentAction = progress => {
@@ -108,18 +123,6 @@ function LaunchServerless(_ref) {
     });
     return (action === null || action === void 0 ? void 0 : action.message) || actions[actions.length - 1].message;
   };
-
-  // 时间管理 - 参考 launch-dedicated.js
-  let installStartTime = sessionStorage.getItem("launcher-install-".concat(sessionId, "-time"));
-  if (!installStartTime) {
-    installStartTime = Date.now();
-    sessionStorage.setItem("launcher-install-".concat(sessionId, "-time"), installStartTime);
-  }
-  const time = (0, _commonComponents.useElapsedTime)(Math.round((Date.now() - installStartTime) / 1000));
-  const startProgress = (0, _react.useMemo)(() => {
-    return Math.min(time / estimatedTime * 100, 90);
-  }, [time, estimatedTime]);
-  const displayProgress = (0, _commonComponents.useDisplayProgress)(startProgress, state.status === STATUS.installed ? Math.min(estimatedTime - time, 2) : estimatedTime);
   const checkLaunchSession = async () => {
     if (window.blocklet.DEVELOPER_WORKFLOW_UI) {
       // 开发模式下的模拟逻辑
@@ -127,7 +130,6 @@ function LaunchServerless(_ref) {
         setState({
           status: STATUS.installed
         });
-        sessionStorage.removeItem("launcher-install-".concat(sessionId, "-time"));
         navigate("/start-app/".concat(sessionId).concat(window.location.search || ''));
       }, 47000);
       return;
@@ -143,7 +145,6 @@ function LaunchServerless(_ref) {
       } = launchSession.metadata;
       const hasInstalled = ['starting', 'installed', 'running', 'stopped'].includes(status) || launchSession.running || launchSession.status >= _constant.LAUNCH_STATUS.consuming;
       if (hasInstalled) {
-        sessionStorage.removeItem("launcher-install-".concat(sessionId, "-time"));
         setState({
           status: STATUS.installed
         });
@@ -172,7 +173,6 @@ function LaunchServerless(_ref) {
           retryCount: state.retryCount + 1
         });
       } else {
-        sessionStorage.removeItem("launcher-install-".concat(sessionId, "-time"));
         setState({
           error: error.message,
           status: STATUS.error,
@@ -188,18 +188,7 @@ function LaunchServerless(_ref) {
     interval: CHECK_INTERVAL,
     onPoll: checkLaunchSession
   });
-  (0, _react.useEffect)(() => {
-    if (state.status === STATUS.installed && displayProgress >= 99) {
-      const timer = setTimeout(() => {
-        sessionStorage.removeItem("launcher-install-".concat(sessionId, "-time"));
-        navigate("/start-app/".concat(sessionId).concat(window.location.search || ''));
-      }, 1500);
-      return () => clearTimeout(timer);
-    }
-    return () => {};
-  }, [state.status, sessionId, navigate, displayProgress]);
   const handleRetry = () => {
-    sessionStorage.removeItem("launcher-install-".concat(sessionId, "-time"));
     navigate("/launch/".concat(sessionId).concat(window.location.search || ''));
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_baseServerlessLayout.default, {

package/lib/components/launch-serverless/shared/common-components.js

@@ -190,9 +190,9 @@ function useDisplayProgress(start) {
     setProgress(prev => Math.max(prev, start));
   }, [start]);
   (0, _react.useEffect)(() => {
-    const timerDuration = Math.round((duration || 1) * 1000 / 99);
+    const timerDuration = Math.round((duration || 1) * 1000 / 100);
     const interval = setInterval(() => {
-      setProgress(prev => Math.min(prev + 1, 99));
+      setProgress(prev => Math.min(prev + 1, 100));
     }, timerDuration);
     return () => clearInterval(interval);
   }, [duration]);

package/lib/components/launch-serverless/shared/retry-error-message.js

@@ -17,6 +17,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  */function RetryErrorMessage(_ref) {
   let {
     title,
+    desc = '',
     onRetry,
     retryText
   } = _ref;
@@ -32,9 +33,13 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
     setIsLoading(false);
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_launchResultMessage.default, {
+    style: {
+      marginTop: '20vh'
+    },
     variant: "error",
     title: title,
-    footer: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
+    subTitle: desc,
+    footer: onRetry && /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
       size: "small",
       style: {
         marginTop: '-16px'
@@ -47,6 +52,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 }
 RetryErrorMessage.propTypes = {
   title: _propTypes.default.string.isRequired,
+  desc: _propTypes.default.string,
   onRetry: _propTypes.default.func.isRequired,
   retryText: _propTypes.default.string.isRequired
 };

package/lib/components/launch-serverless/shared/use-workflow-progress.js

@@ -0,0 +1,191 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = useWorkflowProgress;
+var _react = require("react");
+var _commonComponents = require("./common-components");
+const CACHE_KEY = 'launcher-workflow';
+const CACHE_EXPIRE_DAYS = 3;
+
+/**
+ * 工作流进度管理 Hook
+ * @param {Object} options
+ * @param {string} options.sessionId - 会话ID
+ * @param {string} options.pageName - 页面名称，用于缓存标识
+ * @param {number} options.estimatedTime - 预计完成时间（秒）
+ * @param {boolean} options.isCompleted - 是否已完成
+ * @param {number} [options.initialStartTime] - 初始开始时间
+ * @returns {Object} 进度相关数据
+ */
+function useWorkflowProgress(_ref) {
+  let {
+    sessionId,
+    pageName,
+    estimatedTime,
+    isCompleted,
+    initialStartTime = Date.now()
+  } = _ref;
+  // 缓存操作函数
+  const cache = (0, _react.useMemo)(() => {
+    const getWorkflowCache = () => {
+      try {
+        return JSON.parse(localStorage.getItem(CACHE_KEY) || '{}');
+      } catch (error) {
+        return {};
+      }
+    };
+    const setWorkflowCache = data => {
+      try {
+        localStorage.setItem(CACHE_KEY, JSON.stringify(data));
+      } catch (error) {
+        console.error('Failed to save cache:', error);
+      }
+    };
+    return {
+      get: () => {
+        try {
+          const allCache = getWorkflowCache();
+          const sessionCache = allCache[sessionId] || {};
+          const pageCache = sessionCache[pageName];
+          if (!pageCache) return null;
+          const {
+            startTime,
+            progress,
+            expireTime
+          } = pageCache;
+
+          // 检查是否过期
+          if (expireTime && expireTime < Date.now()) {
+            // 删除过期缓存
+            delete sessionCache[pageName];
+            allCache[sessionId] = sessionCache;
+            setWorkflowCache(allCache);
+            return null;
+          }
+          return {
+            startTime,
+            progress
+          };
+        } catch (error) {
+          console.error('Failed to get cache:', error);
+          return null;
+        }
+      },
+      save: (currentStartTime, progress) => {
+        try {
+          const allCache = getWorkflowCache();
+          const sessionCache = allCache[sessionId] || {};
+          const expireTime = Date.now() + CACHE_EXPIRE_DAYS * 24 * 60 * 60 * 1000;
+          sessionCache[pageName] = {
+            startTime: currentStartTime,
+            progress,
+            expireTime
+          };
+          allCache[sessionId] = sessionCache;
+          setWorkflowCache(allCache);
+        } catch (error) {
+          console.error('Failed to save cache:', error);
+        }
+      },
+      clear: () => {
+        try {
+          const allCache = getWorkflowCache();
+          if (allCache[sessionId]) {
+            delete allCache[sessionId];
+            setWorkflowCache(allCache);
+          }
+        } catch (error) {
+          console.error('Failed to clear cache:', error);
+        }
+      },
+      // 清理所有过期缓存
+      cleanExpired: () => {
+        try {
+          const allCache = getWorkflowCache();
+          const now = Date.now();
+          let hasExpired = false;
+
+          // 遍历所有会话
+          Object.keys(allCache).forEach(sid => {
+            const sessionCache = allCache[sid];
+            // 遍历会话中的所有页面缓存
+            Object.keys(sessionCache).forEach(page => {
+              if (sessionCache[page].expireTime < now) {
+                delete sessionCache[page];
+                hasExpired = true;
+              }
+            });
+            // 如果会话没有页面缓存了，删除会话
+            if (Object.keys(sessionCache).length === 0) {
+              delete allCache[sid];
+            }
+          });
+          if (hasExpired) {
+            setWorkflowCache(allCache);
+          }
+        } catch (error) {
+          console.error('Failed to clean expired cache:', error);
+        }
+      }
+    };
+  }, [sessionId, pageName]);
+
+  // 从缓存获取开始时间
+  const startTimeRef = (0, _react.useRef)();
+  startTimeRef.current = (0, _react.useMemo)(() => {
+    if (startTimeRef.current) return startTimeRef.current;
+    const cached = cache.get();
+    return (cached === null || cached === void 0 ? void 0 : cached.startTime) || initialStartTime;
+  }, [cache, initialStartTime]);
+  const startTime = startTimeRef.current;
+  // 计算已经过去的时间
+  const time = (0, _commonComponents.useElapsedTime)(Math.round((Date.now() - startTime) / 1000));
+
+  // 计算开始进度
+  const progressRef = (0, _react.useRef)();
+  progressRef.current = (0, _react.useMemo)(() => {
+    if (progressRef.current) return progressRef.current;
+    if (isCompleted) return 100;
+    const cached = cache.get();
+    if (cached !== null && cached !== void 0 && cached.progress) {
+      return Math.max(cached.progress, Math.min(time / estimatedTime * 100, 100));
+    }
+    return Math.min(time / estimatedTime * 100, 100);
+  }, [cache, time, estimatedTime, isCompleted]);
+  const startProgress = progressRef.current;
+
+  // 自动保存进度
+  const [lastSaveTime, setLastSaveTime] = (0, _react.useState)(Date.now());
+  (0, _react.useEffect)(() => {
+    if (isCompleted) {
+      cache.save(startTime, 100);
+      return undefined;
+    }
+    const saveTimer = setInterval(() => {
+      const now = Date.now();
+      // 每秒最多保存一次
+      if (now - lastSaveTime >= 1000) {
+        cache.save(startTime, startProgress);
+        setLastSaveTime(now);
+      }
+    }, 1000);
+    return () => {
+      clearInterval(saveTimer);
+      if (!isCompleted) {
+        cache.save(startTime, startProgress);
+      }
+    };
+  }, [cache, isCompleted, startProgress, lastSaveTime, startTime]);
+
+  // 使用进度显示 hook
+  const displayProgress = (0, _commonComponents.useDisplayProgress)(startProgress, isCompleted ? Math.min(estimatedTime - time, 2) : estimatedTime);
+  return {
+    time: isCompleted ? Math.round((Date.now() - startTime) / 1000) : time,
+    startTime,
+    displayProgress,
+    startProgress,
+    cleanExpiredCache: cache.cleanExpired
+  };
+}

package/lib/components/launch-serverless/start-app.js

@@ -15,6 +15,7 @@ var _useSerialPolling = _interopRequireDefault(require("../../hooks/use-serial-p
 var _util = require("../../util");
 var _baseServerlessLayout = _interopRequireDefault(require("./shared/base-serverless-layout"));
 var _commonComponents = require("./shared/common-components");
+var _useWorkflowProgress = _interopRequireDefault(require("./shared/use-workflow-progress"));
 var _loadingDisplayLayout = _interopRequireDefault(require("./shared/loading-display-layout"));
 var _retryErrorMessage = _interopRequireDefault(require("./shared/retry-error-message"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -47,12 +48,12 @@ function LaunchServerless(_ref) {
     accessibleUrl: null,
     urls: [],
     error: '',
+    hiddenRetry: false,
     startTime: 0,
     hasTryStart: false,
     retryRequestCount: 0
   });
   const formatTime = (0, _commonComponents.useFormatTime)();
-  const time = (0, _commonComponents.useElapsedTime)(0);
   const actions = (0, _react.useMemo)(() => {
     // 基础步骤时间
     const steps = [{
@@ -98,7 +99,16 @@ function LaunchServerless(_ref) {
     const additionalTime = (0, _commonComponents.calculateEstimatedTime)(components);
     return actions.reduce((acc, action) => acc + action.time, 0) + additionalTime;
   }, [actions]);
-  const displayProgress = (0, _commonComponents.useDisplayProgress)(0, state.started ? 1 : estimatedTime);
+  const {
+    time,
+    displayProgress,
+    cleanExpiredCache
+  } = (0, _useWorkflowProgress.default)({
+    sessionId,
+    pageName: 'start-app',
+    estimatedTime,
+    isCompleted: state.started
+  });
 
   // 根据当前进度获取对应的 action
   const getCurrentAction = progress => {
@@ -119,24 +129,31 @@ function LaunchServerless(_ref) {
       return null;
     }
   };
-  const getUrls = async blocklet => {
+  const getUrls = (0, _react.useCallback)(async blocklet => {
     let {
       urls
     } = state;
+    const {
+      launchSession
+    } = state;
     if (urls.length === 0) {
+      var _launchSession$appInf;
       urls = (0, _util.getBlockletUrls)({
-        blocklet
+        blocklet: blocklet || (launchSession === null || launchSession === void 0 ? void 0 : launchSession.blocklet) || {}
       });
-      const sortedUrls = await (0, _util.sortUrls)(urls);
-      urls = sortedUrls;
+      const defaultUrl = (launchSession === null || launchSession === void 0 ? void 0 : launchSession.appUrl) || (launchSession === null || launchSession === void 0 || (_launchSession$appInf = launchSession.appInfo) === null || _launchSession$appInf === void 0 ? void 0 : _launchSession$appInf.appUrl);
       if (urls.length > 0) {
-        setState({
-          urls
-        });
+        const sortedUrls = await (0, _util.sortUrls)(urls);
+        urls = sortedUrls;
+      } else if (defaultUrl) {
+        urls = [defaultUrl];
       }
+      setState({
+        urls
+      });
     }
     return urls;
-  };
+  }, [state, setState]);
   const checkLaunchSession = async () => {
     try {
       const {
@@ -219,7 +236,17 @@ function LaunchServerless(_ref) {
   // 检查可用性 url
   const checkAccessibleUrls = async () => {
     try {
-      const urls = await getUrls(state.launchSession.blocklet);
+      const urls = await getUrls();
+      if (urls.length === 0) {
+        setState({
+          error: 'noAppUrl',
+          hiddenRetry: true,
+          starting: false,
+          checkingBlockletStatus: false,
+          checkingAccessible: false
+        });
+        return;
+      }
       const accessibleUrl = await checkOneAccessibleUrl(urls);
       setState(prev => {
         const obj = accessibleUrl ? _objectSpread(_objectSpread({}, prev), {}, {
@@ -284,7 +311,7 @@ function LaunchServerless(_ref) {
               started: false,
               checkingBlockletStatus: false,
               checkingAccessible: false,
-              error: t('startApp.installFailed')
+              error: 'installFailed'
             });
           });
         }
@@ -294,14 +321,14 @@ function LaunchServerless(_ref) {
             _fetch(tryCount - 1);
           }, 1000);
         } else {
+          console.error('get launch session error', error);
           setState({
-            error: error.message,
+            error: 'installFailed',
             starting: false,
             checkingBlockletStatus: false,
             checkingAccessible: false
           });
         }
-        console.error('get launch session error', error);
       }
     };
     if (window.blocklet.DEVELOPER_WORKFLOW_UI) {
@@ -335,12 +362,16 @@ function LaunchServerless(_ref) {
       window.location.reload();
     }
   };
-  const showLoading = state.starting || displayProgress < 99;
-  const showSuccess = !showLoading && state.started && state.launchSession && displayProgress >= 99;
-  const showError = !showLoading && !showSuccess && state.error;
-  if (showError) {
-    console.error('showError', state.error);
-  }
+  const showError = !!state.error;
+  const showSuccess = !showError && state.started && state.launchSession && displayProgress >= 99;
+  const showLoading = !state.error && !showSuccess;
+
+  // 在成功页面清理缓存
+  (0, _react.useEffect)(() => {
+    if (showSuccess) {
+      cleanExpiredCache();
+    }
+  }, [showSuccess, cleanExpiredCache]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_baseServerlessLayout.default, {
     title: t('startApp.pageTitle'),
     children: [showLoading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_loadingDisplayLayout.default, {
@@ -359,7 +390,8 @@ function LaunchServerless(_ref) {
       urls: state.urls
     }), showError && /*#__PURE__*/(0, _jsxRuntime.jsx)(_retryErrorMessage.default, {
       title: t('startApp.startFailed'),
-      onRetry: handleRetry,
+      desc: state.error && state.error !== 'installFailed' ? t("startApp.error.".concat(state.error)) : '',
+      onRetry: state.hiddenRetry ? null : handleRetry,
       retryText: t('common.retry')
     })]
   });

package/lib/locales/en.js

@@ -130,6 +130,9 @@ var _default = exports.default = {
       creatingSecurityRules: 'Creating default security rules...',
       assigningDomain: 'Assigning default domain name...',
       waitingForDomain: 'Waiting for default domain name...'
+    },
+    error: {
+      noAppUrl: 'No accessible URL found, please contact the administrator'
     }
   },
   loading: {

package/lib/locales/zh.js

@@ -129,6 +129,9 @@ var _default = exports.default = {
       creatingSecurityRules: '正在创建默认安全规则...',
       assigningDomain: '正在为 Blocklet 分配默认域名...',
       waitingForDomain: '正在等待默认域名生效...'
+    },
+    error: {
+      noAppUrl: '没有发现 Blocklet 的访问地址，请联系管理员'
     }
   },
   loading: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "2.4.7",
+  "version": "2.4.8",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -49,8 +49,8 @@
     "@arcblock/react-hooks": "^3.0.27",
     "@arcblock/ux": "^3.0.27",
     "@blocklet/launcher-layout": "^3.0.27",
-    "@blocklet/launcher-util": "2.4.7",
-    "@blocklet/launcher-ux": "2.4.7",
+    "@blocklet/launcher-util": "2.4.8",
+    "@blocklet/launcher-ux": "2.4.8",
     "@blocklet/payment": "^1.14.8",
     "@blocklet/payment-react": "^1.19.5",
     "@emotion/react": "^11.14.0",
@@ -109,5 +109,5 @@
       "require": "./lib/locales/index.js"
     }
   },
-  "gitHead": "46f2b90eb04391a02f3fc3dafad2517a73e25994"
+  "gitHead": "ad6b9051901b11aeacc305087d5d5ad89570a6e9"
 }