@blocklet/launcher-workflow 2.5.0 → 2.5.2

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

@@ -46,16 +46,16 @@ function Allocate(_ref) {
     // 基础步骤时间
     const steps = [{
       message: t('launch.waiting.starting'),
-      time: 2
+      time: 1
     }, {
       message: t('launch.waiting.securing'),
-      time: 2
+      time: 1
     }, {
       message: t('launch.waiting.prepare'),
-      time: 5
+      time: 1
     }, {
       message: t('launch.waiting.waiting'),
-      time: 10.5
+      time: 1.5
     }, {
       message: t('launch.waiting.done'),
       time: 0.5
@@ -151,7 +151,8 @@ function Allocate(_ref) {
       const timers = Object.values(timerRef.current); // eslint-disable-line react-hooks/exhaustive-deps
       timers.forEach(timer => clearTimeout(timer));
     };
-  }, [api, estimatedTime, navigate, sessionId, setState]);
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
+
   const handleRetry = async () => {
     try {
       var _state$launchSession;

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

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ActionCardBox = ActionCardBox;
-exports.AppSuccessDisplay = AppSuccessDisplay;
 exports.ErrorDisplay = ErrorDisplay;
 exports.LoadingContainer = LoadingContainer;
 exports.ProductIntroCarousel = ProductIntroCarousel;
@@ -14,20 +13,11 @@ exports.calculateEstimatedTime = void 0;
 exports.proxyUrl = proxyUrl;
 exports.useDisplayProgress = useDisplayProgress;
 exports.useFormatTime = exports.useElapsedTime = void 0;
-var _Img = _interopRequireDefault(require("@arcblock/ux/lib/Img"));
-var _util = require("@blocklet/launcher-util/es/util");
-var _ContentCopy = _interopRequireDefault(require("@mui/icons-material/ContentCopy"));
-var _Dashboard = _interopRequireDefault(require("@mui/icons-material/Dashboard"));
-var _OpenInNew = _interopRequireDefault(require("@mui/icons-material/OpenInNew"));
-var _TaskAlt = _interopRequireDefault(require("@mui/icons-material/TaskAlt"));
 var _material = require("@mui/material");
-var _Chip = _interopRequireDefault(require("@mui/material/Chip"));
-var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
 var _ufo = require("ufo");
 var _locale = require("../../../contexts/locale");
-var _util2 = require("../../../util");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -37,8 +27,8 @@ function proxyUrl(url) {
   }
   return "".concat(window.location.origin, "/.well-known/service/proxy?url=").concat(url);
 }
-const COMPONENT_BASE_TIME = 2; // 每个组件基础处理时间 4s
-const SIZE_TIME_RATIO = 0.2; // 每 1MB 增加 1s
+const COMPONENT_BASE_TIME = 1; // 每个组件基础处理时间 1s
+const SIZE_TIME_RATIO = 0.1; // 每 1MB 增加 0.2s
 // 计算预估安装时间
 const calculateEstimatedTime = exports.calculateEstimatedTime = function calculateEstimatedTime() {
   let components = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -312,291 +302,4 @@ function ErrorDisplay(_ref6) {
 ErrorDisplay.propTypes = {
   error: _propTypes.default.string,
   onRetry: _propTypes.default.func
-};
-function AppSuccessDisplay(_ref7) {
-  var _launchSession$appInf, _launchSession$blockl, _launchSession$appInf2, _launchSession$metada;
-  let {
-    accessibleUrl,
-    sessionId,
-    blockletInfo,
-    urls,
-    launchSession
-  } = _ref7;
-  const theme = (0, _material.useTheme)();
-  const {
-    t
-  } = (0, _locale.useLocaleContext)();
-  const showUrl = (0, _react.useMemo)(() => {
-    return localStorage.getItem('show-url') === 'true';
-  }, []);
-
-  // 获取应用基本信息
-  const appName = (blockletInfo === null || blockletInfo === void 0 ? void 0 : blockletInfo.appName) || t('startApp.unknownApp');
-  const appVersion = (blockletInfo === null || blockletInfo === void 0 ? void 0 : blockletInfo.version) || ((_launchSession$appInf = launchSession.appInfo) === null || _launchSession$appInf === void 0 ? void 0 : _launchSession$appInf.version) || ((_launchSession$blockl = launchSession.blockletMeta) === null || _launchSession$blockl === void 0 ? void 0 : _launchSession$blockl.version) || '';
-  const appLogo = (blockletInfo === null || blockletInfo === void 0 ? void 0 : blockletInfo.appLogo) || ((_launchSession$appInf2 = launchSession.appInfo) === null || _launchSession$appInf2 === void 0 ? void 0 : _launchSession$appInf2.appLogo) || '';
-  const description = (blockletInfo === null || blockletInfo === void 0 ? void 0 : blockletInfo.appDescription) || ((_launchSession$metada = launchSession.metadata) === null || _launchSession$metada === void 0 ? void 0 : _launchSession$metada.description);
-  (0, _react.useEffect)(() => {
-    const stepActive = document.querySelector('.step-active');
-    if (stepActive) {
-      stepActive.classList.add('step-checked');
-    }
-  }, []);
-  const [accessibleUrls, setAccessibleUrls] = (0, _react.useState)([accessibleUrl]);
-  (0, _react.useEffect)(() => {
-    const checkUrls = urls.filter(url => !accessibleUrls.includes(url));
-    checkUrls.forEach(url => {
-      (0, _util2.checkUrlAccessible)(url, 10 * 60 * 1000).then(res => {
-        if (res) {
-          setAccessibleUrls(prev => {
-            const accessible = [...prev, url];
-            return urls.filter(item => accessible.includes(item));
-          });
-        }
-      });
-    });
-  }, [accessibleUrls, urls]);
-  const appUrl = accessibleUrls[0] || urls[0];
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-    sx: {
-      width: '100%',
-      maxWidth: 800,
-      margin: '0 auto',
-      p: {
-        xs: 0,
-        sm: 3
-      }
-    },
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-      textAlign: "center",
-      mb: 4,
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
-        sx: {
-          width: 80,
-          height: 80,
-          borderRadius: '50%',
-          backgroundColor: (0, _material.alpha)(theme.palette.success.main, 0.2),
-          display: 'flex',
-          alignItems: 'center',
-          justifyContent: 'center',
-          margin: '0 auto 16px'
-        },
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_TaskAlt.default, {
-          sx: {
-            fontSize: 40,
-            color: 'success.main'
-          }
-        })
-      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Typography, {
-        variant: "h3",
-        component: "h1",
-        fontWeight: "bold",
-        gutterBottom: true,
-        children: ["\uD83C\uDF89 ", t('startApp.started')]
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
-        variant: "body1",
-        color: "text.secondary",
-        children: t('startApp.startedDescription')
-      })]
-    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-      sx: {
-        p: 3,
-        mb: 3,
-        borderRadius: 2,
-        border: '1px solid',
-        borderColor: 'divider',
-        backgroundColor: 'background.paper'
-      },
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-        display: "flex",
-        alignItems: "center",
-        gap: 2,
-        mb: 2,
-        flexWrap: "wrap",
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-          flex: 1,
-          display: "flex",
-          alignItems: "center",
-          gap: 2,
-          children: [appLogo ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Img.default, {
-            src: (0, _ufo.joinURL)(appUrl, appLogo),
-            alt: appName,
-            width: 48,
-            height: 48,
-            style: {
-              borderRadius: 10,
-              overflow: 'hidden'
-            }
-          }, appUrl) : null, /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-            flex: 1,
-            textAlign: "left",
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
-              variant: "h6",
-              color: "text.hint",
-              mb: 1,
-              children: t('startApp.projectName')
-            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
-              variant: "body1",
-              fontWeight: "medium",
-              children: appName
-            })]
-          })]
-        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-          flex: 1,
-          display: "flex",
-          alignItems: "center",
-          gap: 2,
-          minWidth: {
-            xs: '100%',
-            sm: 'auto'
-          },
-          children: [appVersion ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-            flex: 1,
-            textAlign: "left",
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
-              variant: "h6",
-              color: "text.hint",
-              mb: 1,
-              children: t('startApp.version')
-            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Chip.default, {
-              label: "v".concat(appVersion),
-              size: "small",
-              color: "primary",
-              variant: "outlined"
-            })]
-          }) : null, /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-            flex: 1,
-            textAlign: "left",
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
-              variant: "h6",
-              color: "text.hint",
-              mb: 1,
-              children: t('startApp.status')
-            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Chip.default, {
-              label: t('startApp.running'),
-              size: "small",
-              color: "success"
-            })]
-          })]
-        })]
-      }), description && /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
-        variant: "body2",
-        color: "text.secondary",
-        textAlign: "left",
-        children: description
-      }), showUrl && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
-          variant: "h6",
-          color: "text.hint",
-          textAlign: "left",
-          children: t('startApp.visitUrl')
-        }), urls.map(url => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-          display: "flex",
-          alignItems: "center",
-          mt: 1,
-          gap: 1,
-          sx: {
-            backgroundColor: 'divider',
-            borderRadius: 1,
-            py: 0.5,
-            px: 1.5,
-            flex: 1
-          },
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
-            sx: {
-              width: 8,
-              height: 8,
-              borderRadius: '50%',
-              backgroundColor: accessibleUrls.includes(url) ? 'success.main' : 'error.main'
-            }
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
-            variant: "body2",
-            textAlign: "left",
-            sx: {
-              flex: 1,
-              fontSize: '0.875rem',
-              wordBreak: 'break-all'
-            },
-            children: url
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_IconButton.default, {
-            size: "small",
-            onClick: () => navigator.clipboard.writeText(url),
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ContentCopy.default, {
-              sx: {
-                fontSize: 16
-              }
-            })
-          })]
-        }, url))]
-      })]
-    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-      display: "flex",
-      flexDirection: "column",
-      gap: 2,
-      mt: 4,
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-        display: "flex",
-        gap: 2,
-        margin: "0 auto",
-        flexDirection: {
-          xs: 'column-reverse',
-          md: 'row'
-        },
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
-          variant: "outlined",
-          sx: {
-            minWidth: 220
-          },
-          color: "primary",
-          onClick: () => window.open((0, _ufo.joinURL)((0, _util.getBaseURL)(), "/api/launches/".concat(sessionId, "/redirect/dashboard?appUrl=").concat(appUrl)), '_blank'),
-          startIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Dashboard.default, {
-            sx: {
-              fontSize: 24,
-              color: 'primary.main'
-            }
-          }),
-          children: t('startApp.dashboard')
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
-          variant: "contained",
-          color: "primary",
-          sx: {
-            minWidth: 220
-          },
-          onClick: () => window.open((0, _ufo.joinURL)((0, _util.getBaseURL)(), "/api/launches/".concat(sessionId, "/redirect/app?appUrl=").concat(appUrl)), '_blank'),
-          startIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_OpenInNew.default, {
-            sx: {
-              fontSize: 24,
-              color: 'inherit'
-            }
-          }),
-          children: t('startApp.visitApp')
-        })]
-      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Typography, {
-        variant: "body2",
-        color: "text.secondary",
-        sx: {
-          margin: '0 auto',
-          fontWeight: 400,
-          cursor: 'pointer',
-          display: 'flex',
-          alignItems: 'center',
-          gap: 0.5,
-          opacity: 0.8
-        },
-        onClick: () => window.open((0, _util.getSubscriptionLink)(launchSession.subscriptionId), '_blank'),
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_OpenInNew.default, {
-          sx: {
-            fontSize: 14,
-            color: 'inherit'
-          }
-        }), t('startApp.subscription')]
-      })]
-    })]
-  });
-}
-AppSuccessDisplay.propTypes = {
-  launchSession: _propTypes.default.object.isRequired,
-  urls: _propTypes.default.arrayOf(_propTypes.default.string).isRequired,
-  accessibleUrl: _propTypes.default.string.isRequired,
-  sessionId: _propTypes.default.string.isRequired,
-  blockletInfo: _propTypes.default.object.isRequired
 };