@blocklet/launcher-workflow 2.4.9 → 2.5.1

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

@@ -41,10 +41,10 @@ export default function Allocate({
       time: 1
     }, {
       message: t('launch.waiting.waiting'),
-      time: 1
+      time: 1.5
     }, {
       message: t('launch.waiting.done'),
-      time: 1
+      time: 0.5
     }];
 
     // 计算总时间
@@ -106,13 +106,11 @@ export default function Allocate({
         } else if (launchSession.status >= LAUNCH_STATUS.allocated) {
           navigate(`/install/${sessionId}${window.location.search || ''}`);
         } else {
-          await Promise.all([api.post('/serverless/allocate', {
+          await api.post('/serverless/allocate', {
             launchId: sessionId
-          }), new Promise(resolve => {
-            timersRef.current.raceTimer = setTimeout(() => {
-              resolve();
-            }, estimatedTime * 1000);
-          })]);
+          }, {
+            timeout: (estimatedTime + 30) * 1000
+          });
           setState({
             allocating: false,
             allocated: true
@@ -137,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/base-serverless-layout.js

@@ -1,6 +1,7 @@
 import { Box } from '@mui/material';
 import PropTypes from 'prop-types';
-import React from 'react';
+import React, { useEffect } from 'react';
+import { useSearchParams } from 'react-router-dom';
 import Spinner from '@mui/material/CircularProgress';
 
 /**
@@ -13,6 +14,17 @@ export default function BaseServerlessLayout({
   children,
   isLoading = false
 }) {
+  const [searchParams, setSearchParams] = useSearchParams();
+
+  // 删除 URL 中的 sessionId 参数
+  useEffect(() => {
+    if (searchParams.has('sessionId')) {
+      searchParams.delete('sessionId');
+      setSearchParams(searchParams, {
+        replace: true
+      });
+    }
+  }, [searchParams, setSearchParams]);
   return /*#__PURE__*/_jsx(Box, {
     sx: {
       display: 'flex',

package/es/components/launch-serverless/shared/loading-display-layout.js

@@ -59,10 +59,14 @@ function LoadingDisplayLayout({
         messageLoop: false,
         size: 200
       })
+    }), /*#__PURE__*/_jsx(ActionCardBox, {
+      tipFlag: tipFlag || currentAction,
+      children: currentAction
     }), /*#__PURE__*/_jsxs(Box, {
       sx: {
         position: 'relative',
-        width: '100%'
+        width: '100%',
+        mt: 2
       },
       children: [/*#__PURE__*/_jsx(Box, {
         sx: {
@@ -93,9 +97,6 @@ function LoadingDisplayLayout({
           children: elapsedTime
         })]
       })]
-    }), /*#__PURE__*/_jsx(ActionCardBox, {
-      tipFlag: tipFlag || currentAction,
-      children: currentAction
     }), /*#__PURE__*/_jsx(ProductIntroCarousel, {
       tips: tips
     }, locale), /*#__PURE__*/_jsx(ErrorDisplay, {

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

@@ -114,13 +114,11 @@ export default function StartApp({
       return null;
     }
   };
-  const getUrls = useCallback(async blocklet => {
+  const getUrls = useCallback(async (blocklet, launch) => {
+    const launchSession = launch || state.launchSession;
     let {
       urls
     } = state;
-    const {
-      launchSession
-    } = state;
     if (urls.length === 0) {
       urls = getBlockletUrls({
         blocklet: blocklet || launchSession?.blocklet || {}
@@ -279,7 +277,7 @@ export default function StartApp({
           blockletStatus,
           metadata
         } = launchSession;
-        const urls = await getUrls(blocklet);
+        const urls = await getUrls(blocklet, launchSession);
         launchSession.urls = urls;
         [launchSession.appUrl] = urls;
         setState({

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

@@ -55,10 +55,10 @@ function Allocate(_ref) {
       time: 1
     }, {
       message: t('launch.waiting.waiting'),
-      time: 1
+      time: 1.5
     }, {
       message: t('launch.waiting.done'),
-      time: 1
+      time: 0.5
     }];
 
     // 计算总时间
@@ -122,13 +122,11 @@ function Allocate(_ref) {
         } else if (launchSession.status >= _constant.LAUNCH_STATUS.allocated) {
           navigate("/install/".concat(sessionId).concat(window.location.search || ''));
         } else {
-          await Promise.all([api.post('/serverless/allocate', {
+          await api.post('/serverless/allocate', {
             launchId: sessionId
-          }), new Promise(resolve => {
-            timersRef.current.raceTimer = setTimeout(() => {
-              resolve();
-            }, estimatedTime * 1000);
-          })]);
+          }, {
+            timeout: (estimatedTime + 30) * 1000
+          });
           setState({
             allocating: false,
             allocated: true
@@ -153,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/base-serverless-layout.js

@@ -6,9 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = BaseServerlessLayout;
 var _material = require("@mui/material");
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 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 }; }
 /**
  * 无服务器启动流程的基础布局组件
@@ -19,6 +21,17 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
     children,
     isLoading = false
   } = _ref;
+  const [searchParams, setSearchParams] = (0, _reactRouterDom.useSearchParams)();
+
+  // 删除 URL 中的 sessionId 参数
+  (0, _react.useEffect)(() => {
+    if (searchParams.has('sessionId')) {
+      searchParams.delete('sessionId');
+      setSearchParams(searchParams, {
+        replace: true
+      });
+    }
+  }, [searchParams, setSearchParams]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
     sx: {
       display: 'flex',

package/lib/components/launch-serverless/shared/loading-display-layout.js

@@ -68,10 +68,14 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
         messageLoop: false,
         size: 200
       })
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_commonComponents.ActionCardBox, {
+      tipFlag: tipFlag || currentAction,
+      children: currentAction
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
       sx: {
         position: 'relative',
-        width: '100%'
+        width: '100%',
+        mt: 2
       },
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
         sx: {
@@ -102,9 +106,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
           children: elapsedTime
         })]
       })]
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_commonComponents.ActionCardBox, {
-      tipFlag: tipFlag || currentAction,
-      children: currentAction
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_commonComponents.ProductIntroCarousel, {
       tips: tips
     }, locale), /*#__PURE__*/(0, _jsxRuntime.jsx)(_commonComponents.ErrorDisplay, {

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

@@ -131,13 +131,11 @@ function StartApp(_ref) {
       return null;
     }
   };
-  const getUrls = (0, _react.useCallback)(async blocklet => {
+  const getUrls = (0, _react.useCallback)(async (blocklet, launch) => {
+    const launchSession = launch || state.launchSession;
     let {
       urls
     } = state;
-    const {
-      launchSession
-    } = state;
     if (urls.length === 0) {
       var _launchSession$appInf;
       urls = (0, _util.getBlockletUrls)({
@@ -293,7 +291,7 @@ function StartApp(_ref) {
           blockletStatus,
           metadata
         } = launchSession;
-        const urls = await getUrls(blocklet);
+        const urls = await getUrls(blocklet, launchSession);
         launchSession.urls = urls;
         [launchSession.appUrl] = urls;
         setState({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "2.4.9",
+  "version": "2.5.1",
   "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.9",
-    "@blocklet/launcher-ux": "2.4.9",
+    "@blocklet/launcher-util": "2.5.1",
+    "@blocklet/launcher-ux": "2.5.1",
     "@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": "c96a73602a1dc1742293261a48f60858ab2b3b38"
+  "gitHead": "75da6f8ae4a51615593b3bbf84a14b912d6df3b9"
 }