@blocklet/launcher-workflow 2.5.0 → 2.5.2

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

@@ -32,16 +32,16 @@ export default function Allocate({
     // 基础步骤时间
     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
@@ -135,7 +135,8 @@ export default function Allocate({
       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 {
       clearCache();

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

@@ -1,17 +1,8 @@
-import Img from '@arcblock/ux/lib/Img';
-import { getBaseURL, getSubscriptionLink } from '@blocklet/launcher-util/es/util';
-import ContentCopyIcon from '@mui/icons-material/ContentCopy';
-import DashboardIcon from '@mui/icons-material/Dashboard';
-import OpenInNewIcon from '@mui/icons-material/OpenInNew';
-import TaskAltIcon from '@mui/icons-material/TaskAlt';
-import { Alert, AlertTitle, alpha, Box, Button, LinearProgress, Typography, useTheme } from '@mui/material';
-import Chip from '@mui/material/Chip';
-import IconButton from '@mui/material/IconButton';
+import { Alert, AlertTitle, Box, LinearProgress, Typography } from '@mui/material';
 import PropTypes from 'prop-types';
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { joinURL } from 'ufo';
 import { useLocaleContext } from '../../../contexts/locale';
-import { checkUrlAccessible } from '../../../util';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export function proxyUrl(url) {
   if (url.startsWith('/')) {
@@ -19,8 +10,8 @@ export function proxyUrl(url) {
   }
   return `${window.location.origin}/.well-known/service/proxy?url=${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
 // 计算预估安装时间
 export const calculateEstimatedTime = (components = []) => {
   if (!Array.isArray(components) || components.length === 0) {
@@ -282,289 +273,4 @@ export function ErrorDisplay({
 ErrorDisplay.propTypes = {
   error: PropTypes.string,
   onRetry: PropTypes.func
-};
-export function AppSuccessDisplay({
-  accessibleUrl,
-  sessionId,
-  blockletInfo,
-  urls,
-  launchSession
-}) {
-  const theme = useTheme();
-  const {
-    t
-  } = useLocaleContext();
-  const showUrl = useMemo(() => {
-    return localStorage.getItem('show-url') === 'true';
-  }, []);
-
-  // 获取应用基本信息
-  const appName = blockletInfo?.appName || t('startApp.unknownApp');
-  const appVersion = blockletInfo?.version || launchSession.appInfo?.version || launchSession.blockletMeta?.version || '';
-  const appLogo = blockletInfo?.appLogo || launchSession.appInfo?.appLogo || '';
-  const description = blockletInfo?.appDescription || launchSession.metadata?.description;
-  useEffect(() => {
-    const stepActive = document.querySelector('.step-active');
-    if (stepActive) {
-      stepActive.classList.add('step-checked');
-    }
-  }, []);
-  const [accessibleUrls, setAccessibleUrls] = useState([accessibleUrl]);
-  useEffect(() => {
-    const checkUrls = urls.filter(url => !accessibleUrls.includes(url));
-    checkUrls.forEach(url => {
-      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__*/_jsxs(Box, {
-    sx: {
-      width: '100%',
-      maxWidth: 800,
-      margin: '0 auto',
-      p: {
-        xs: 0,
-        sm: 3
-      }
-    },
-    children: [/*#__PURE__*/_jsxs(Box, {
-      textAlign: "center",
-      mb: 4,
-      children: [/*#__PURE__*/_jsx(Box, {
-        sx: {
-          width: 80,
-          height: 80,
-          borderRadius: '50%',
-          backgroundColor: alpha(theme.palette.success.main, 0.2),
-          display: 'flex',
-          alignItems: 'center',
-          justifyContent: 'center',
-          margin: '0 auto 16px'
-        },
-        children: /*#__PURE__*/_jsx(TaskAltIcon, {
-          sx: {
-            fontSize: 40,
-            color: 'success.main'
-          }
-        })
-      }), /*#__PURE__*/_jsxs(Typography, {
-        variant: "h3",
-        component: "h1",
-        fontWeight: "bold",
-        gutterBottom: true,
-        children: ["\uD83C\uDF89 ", t('startApp.started')]
-      }), /*#__PURE__*/_jsx(Typography, {
-        variant: "body1",
-        color: "text.secondary",
-        children: t('startApp.startedDescription')
-      })]
-    }), /*#__PURE__*/_jsxs(Box, {
-      sx: {
-        p: 3,
-        mb: 3,
-        borderRadius: 2,
-        border: '1px solid',
-        borderColor: 'divider',
-        backgroundColor: 'background.paper'
-      },
-      children: [/*#__PURE__*/_jsxs(Box, {
-        display: "flex",
-        alignItems: "center",
-        gap: 2,
-        mb: 2,
-        flexWrap: "wrap",
-        children: [/*#__PURE__*/_jsxs(Box, {
-          flex: 1,
-          display: "flex",
-          alignItems: "center",
-          gap: 2,
-          children: [appLogo ? /*#__PURE__*/_jsx(Img, {
-            src: joinURL(appUrl, appLogo),
-            alt: appName,
-            width: 48,
-            height: 48,
-            style: {
-              borderRadius: 10,
-              overflow: 'hidden'
-            }
-          }, appUrl) : null, /*#__PURE__*/_jsxs(Box, {
-            flex: 1,
-            textAlign: "left",
-            children: [/*#__PURE__*/_jsx(Typography, {
-              variant: "h6",
-              color: "text.hint",
-              mb: 1,
-              children: t('startApp.projectName')
-            }), /*#__PURE__*/_jsx(Typography, {
-              variant: "body1",
-              fontWeight: "medium",
-              children: appName
-            })]
-          })]
-        }), /*#__PURE__*/_jsxs(Box, {
-          flex: 1,
-          display: "flex",
-          alignItems: "center",
-          gap: 2,
-          minWidth: {
-            xs: '100%',
-            sm: 'auto'
-          },
-          children: [appVersion ? /*#__PURE__*/_jsxs(Box, {
-            flex: 1,
-            textAlign: "left",
-            children: [/*#__PURE__*/_jsx(Typography, {
-              variant: "h6",
-              color: "text.hint",
-              mb: 1,
-              children: t('startApp.version')
-            }), /*#__PURE__*/_jsx(Chip, {
-              label: `v${appVersion}`,
-              size: "small",
-              color: "primary",
-              variant: "outlined"
-            })]
-          }) : null, /*#__PURE__*/_jsxs(Box, {
-            flex: 1,
-            textAlign: "left",
-            children: [/*#__PURE__*/_jsx(Typography, {
-              variant: "h6",
-              color: "text.hint",
-              mb: 1,
-              children: t('startApp.status')
-            }), /*#__PURE__*/_jsx(Chip, {
-              label: t('startApp.running'),
-              size: "small",
-              color: "success"
-            })]
-          })]
-        })]
-      }), description && /*#__PURE__*/_jsx(Typography, {
-        variant: "body2",
-        color: "text.secondary",
-        textAlign: "left",
-        children: description
-      }), showUrl && /*#__PURE__*/_jsxs(Box, {
-        children: [/*#__PURE__*/_jsx(Typography, {
-          variant: "h6",
-          color: "text.hint",
-          textAlign: "left",
-          children: t('startApp.visitUrl')
-        }), urls.map(url => /*#__PURE__*/_jsxs(Box, {
-          display: "flex",
-          alignItems: "center",
-          mt: 1,
-          gap: 1,
-          sx: {
-            backgroundColor: 'divider',
-            borderRadius: 1,
-            py: 0.5,
-            px: 1.5,
-            flex: 1
-          },
-          children: [/*#__PURE__*/_jsx(Box, {
-            sx: {
-              width: 8,
-              height: 8,
-              borderRadius: '50%',
-              backgroundColor: accessibleUrls.includes(url) ? 'success.main' : 'error.main'
-            }
-          }), /*#__PURE__*/_jsx(Typography, {
-            variant: "body2",
-            textAlign: "left",
-            sx: {
-              flex: 1,
-              fontSize: '0.875rem',
-              wordBreak: 'break-all'
-            },
-            children: url
-          }), /*#__PURE__*/_jsx(IconButton, {
-            size: "small",
-            onClick: () => navigator.clipboard.writeText(url),
-            children: /*#__PURE__*/_jsx(ContentCopyIcon, {
-              sx: {
-                fontSize: 16
-              }
-            })
-          })]
-        }, url))]
-      })]
-    }), /*#__PURE__*/_jsxs(Box, {
-      display: "flex",
-      flexDirection: "column",
-      gap: 2,
-      mt: 4,
-      children: [/*#__PURE__*/_jsxs(Box, {
-        display: "flex",
-        gap: 2,
-        margin: "0 auto",
-        flexDirection: {
-          xs: 'column-reverse',
-          md: 'row'
-        },
-        children: [/*#__PURE__*/_jsx(Button, {
-          variant: "outlined",
-          sx: {
-            minWidth: 220
-          },
-          color: "primary",
-          onClick: () => window.open(joinURL(getBaseURL(), `/api/launches/${sessionId}/redirect/dashboard?appUrl=${appUrl}`), '_blank'),
-          startIcon: /*#__PURE__*/_jsx(DashboardIcon, {
-            sx: {
-              fontSize: 24,
-              color: 'primary.main'
-            }
-          }),
-          children: t('startApp.dashboard')
-        }), /*#__PURE__*/_jsx(Button, {
-          variant: "contained",
-          color: "primary",
-          sx: {
-            minWidth: 220
-          },
-          onClick: () => window.open(joinURL(getBaseURL(), `/api/launches/${sessionId}/redirect/app?appUrl=${appUrl}`), '_blank'),
-          startIcon: /*#__PURE__*/_jsx(OpenInNewIcon, {
-            sx: {
-              fontSize: 24,
-              color: 'inherit'
-            }
-          }),
-          children: t('startApp.visitApp')
-        })]
-      }), /*#__PURE__*/_jsxs(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(getSubscriptionLink(launchSession.subscriptionId), '_blank'),
-        children: [/*#__PURE__*/_jsx(OpenInNewIcon, {
-          sx: {
-            fontSize: 14,
-            color: 'inherit'
-          }
-        }), t('startApp.subscription')]
-      })]
-    })]
-  });
-}
-AppSuccessDisplay.propTypes = {
-  launchSession: PropTypes.object.isRequired,
-  urls: PropTypes.arrayOf(PropTypes.string).isRequired,
-  accessibleUrl: PropTypes.string.isRequired,
-  sessionId: PropTypes.string.isRequired,
-  blockletInfo: PropTypes.object.isRequired
 };