@blocklet/launcher-workflow 1.5.48 → 1.5.51

package/lib/components/instance-operation.js

@@ -15,6 +15,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _lodash = _interopRequireDefault(require("lodash.get"));
 
+var _lodash2 = _interopRequireDefault(require("lodash.throttle"));
+
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
@@ -81,10 +83,6 @@ function OperationPage(_ref) {
   const {
     api
   } = (0, _request.default)();
-  const [frameLoading, setFrameLoading] = (0, _react.useState)(true);
-  (0, _reactUse.useInterval)(async () => {
-    await getInstanceStatus();
-  }, launchState.status === STATUS.launching && nftId ? 5000 : null); // TODO: 这样处理容易发出重复的请求
 
   const getInstanceStatus = async () => {
     try {
@@ -95,11 +93,16 @@ function OperationPage(_ref) {
       } = await api.get("/public/instances/".concat(nftId, "/status"));
 
       if (instance.status >= _constant.INSTANCE_STATUS.running) {
+        const url = (0, _util.getLaunchBlockletUrl)(instance.serverUrl, blockletMetaUrl, locale);
         setLaunchState(pre => _objectSpread(_objectSpread({}, pre), {}, {
           status: STATUS.success,
-          appUrl: (0, _util.getLaunchBlockletUrl)(instance.serverUrl, blockletMetaUrl, locale)
+          appUrl: url
         }));
-        return;
+        (0, _util.loadURL)(url).finally(() => {
+          setTimeout(() => {
+            window.location.href = url;
+          }, 1000);
+        });
       }
     } catch (error) {
       if ((0, _lodash.default)(error, 'response.status') === 404 && launchState.status !== STATUS.launching) {
@@ -117,6 +120,8 @@ function OperationPage(_ref) {
     }
   };
 
+  const poll = (0, _lodash2.default)(getInstanceStatus, 5000);
+  (0, _reactUse.useInterval)(poll, launchState.status === STATUS.launching && nftId ? 5000 : null);
   (0, _react.useEffect)(() => {
     if (!nftId) {
       return;
@@ -131,41 +136,6 @@ function OperationPage(_ref) {
     });
   }, [nftId]); // eslint-disable-line
 
-  (0, _react.useEffect)(() => {
-    let preloadFrame;
-    let timer;
-
-    if (launchState.appUrl) {
-      preloadFrame = document.createElement('iframe');
-      preloadFrame.src = launchState.appUrl;
-      Object.assign(preloadFrame.style, {
-        width: 0,
-        height: 0,
-        border: 0,
-        display: 'block',
-        position: 'absolute',
-        top: 0
-      });
-      preloadFrame.addEventListener('load', () => {
-        setFrameLoading(false);
-        clearTimeout(timer);
-      });
-      document.body.appendChild(preloadFrame);
-      timer = setTimeout(() => {
-        setFrameLoading(false);
-      }, 5000);
-    }
-
-    return () => {
-      if (preloadFrame) {
-        preloadFrame.parentNode.removeChild(preloadFrame);
-      }
-
-      if (timer) {
-        clearTimeout(timer);
-      }
-    };
-  }, [launchState.appUrl]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, launchState.status !== STATUS.success && /*#__PURE__*/_react.default.createElement(_pageHeader.default, {
     title: t("".concat(type, ".title"))
   }), /*#__PURE__*/_react.default.createElement(Content, null, launchState.status === STATUS.waiting && /*#__PURE__*/_react.default.createElement("div", {
@@ -182,15 +152,11 @@ function OperationPage(_ref) {
     className: "message",
     variant: "success",
     title: t('launch.launched'),
-    subTitle: blockletMetaUrl ? t('launch.launchBlockletTip') : '',
-    footer: /*#__PURE__*/_react.default.createElement(_Button.default, {
-      color: "primary",
-      variant: "contained",
-      rounded: true,
-      loading: frameLoading,
+    footer: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("a", {
+      className: "link",
       href: launchState.appUrl,
-      className: "button"
-    }, blockletMetaUrl ? t('launch.launchApp') : t('launch.accessServer'))
+      target: "_self"
+    }, t('common.redirecting')), "...")
   }), [STATUS.error, STATUS.launchFailedError].includes(launchState.status) && /*#__PURE__*/_react.default.createElement(_launchResultMessage.default, {
     variant: "error",
     title: t("".concat(type, ".error.launchFailed")),
@@ -221,7 +187,7 @@ function OperationPage(_ref) {
 const Content = _styledComponents.default.div.withConfig({
   displayName: "instance-operation__Content",
   componentId: "sc-1fcaixs-0"
-})(["margin:auto;height:100%;.status{color:", ";display:flex;flex-direction:column;align-items:center;.status-spinner{color:inherit !important;}.status-text{display:inline-block;padding:0 20px;max-width:420px;margin-top:24px;text-align:center;}}.button{min-width:150px;margin-bottom:100px;}.center{display:flex;align-items:center;justify-content:center;width:100%;height:100%;}"], props => props.theme.palette.primary.main);
+})(["margin:auto;height:100%;.link{color:#4f6af6;}.link:hover{text-decoration:underline !important;}.status{color:", ";display:flex;flex-direction:column;align-items:center;.status-spinner{color:inherit !important;}.status-text{display:inline-block;padding:0 20px;max-width:420px;margin-top:24px;text-align:center;}}.button{min-width:150px;margin-bottom:100px;}.center{display:flex;align-items:center;justify-content:center;width:100%;height:100%;}"], props => props.theme.palette.primary.main);
 
 OperationPage.propTypes = {
   type: _propTypes.default.oneOf(['launch', 'start']),

package/lib/locales/en.js

@@ -12,7 +12,8 @@ module.exports = {
     launch: 'Launch',
     next: 'Next',
     purchase: 'Purchase',
-    redeem: 'Redeem'
+    redeem: 'Redeem',
+    redirecting: 'Redirecting'
   },
   plan: {
     title: 'Select Blocklet Server Type',
@@ -41,7 +42,6 @@ module.exports = {
     launching: 'Your Blocklet Server is being baked, please be patient, it usually takes about 5 minutes',
     launched: 'Your Blocklet Server is up and running',
     launchSuccess: 'Blocklet Server is successfully launched',
-    launchBlockletTip: 'Click the button below to launch the application',
     loadStatusFailed: 'Failed to load Blocklet Server status',
     waitingForLaunching: 'Your Blocklet Server launch request is being processed, please be patient, it usually takes about 5 minutes',
     accessServer: 'Access Blocklet Server',

package/lib/locales/zh.js

@@ -12,7 +12,8 @@ module.exports = {
     launch: '启动',
     next: '下一步',
     redeem: '兑换',
-    purchase: '购买'
+    purchase: '购买',
+    redirecting: '跳转中'
   },
   plan: {
     title: '创建节点',
@@ -41,7 +42,6 @@ module.exports = {
     launching: '节点正在启动中, 大约需要 5 分钟',
     launched: '节点已启动',
     launchSuccess: '创建节点成功',
-    launchBlockletTip: '点击下面的按钮启动应用',
     loadStatusFailed: '加载实例状态失败',
     waitingForLaunching: '节点正在启动中，大约需要 5 分钟',
     accessServer: '访问节点',

package/lib/util.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getBlockletMetaUrl = getBlockletMetaUrl;
-exports.getLaunchBlockletUrl = void 0;
+exports.loadURL = exports.getLaunchBlockletUrl = void 0;
 
 var _urlJoin = _interopRequireDefault(require("url-join"));
 
@@ -28,4 +28,31 @@ const getLaunchBlockletUrl = (serverUrl, blockletMetaUrl, locale) => {
   return result;
 };
 
-exports.getLaunchBlockletUrl = getLaunchBlockletUrl;
+exports.getLaunchBlockletUrl = getLaunchBlockletUrl;
+
+const loadURL = url => new Promise(resolve => {
+  let timer;
+  const iframe = document.createElement('iframe');
+  iframe.src = url;
+  Object.assign(iframe.style, {
+    width: 0,
+    height: 0,
+    border: 0,
+    display: 'block',
+    position: 'absolute',
+    top: 0
+  });
+
+  const done = () => {
+    clearTimeout(timer);
+    iframe.parentNode.removeChild(iframe);
+    resolve();
+  };
+
+  document.onload = done;
+  document.onerror = done;
+  document.body.appendChild(iframe);
+  timer = setTimeout(done, 5000);
+});
+
+exports.loadURL = loadURL;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "1.5.48",
+  "version": "1.5.51",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -40,11 +40,11 @@
     "@arcblock/did-connect": "^1.16.40",
     "@arcblock/icons": "^1.16.40",
     "@arcblock/ux": "^1.16.40",
-    "@blocklet/launcher-layout": "1.5.48",
+    "@blocklet/launcher-layout": "1.5.51",
     "@material-ui/core": "^4.12.3",
     "@material-ui/icons": "^4.11.2",
     "@material-ui/lab": "^4.0.0-alpha.60",
-    "@ocap/util": "^1.14.19",
+    "@ocap/util": "^1.14.21",
     "@stripe/react-stripe-js": "^1.7.0",
     "@stripe/stripe-js": "^1.22.0",
     "@styled-icons/remix-fill": "^10.18.0",
@@ -66,5 +66,5 @@
     "babel-plugin-inline-react-svg": "^2.0.1",
     "babel-plugin-styled-components": "^1.10.7"
   },
-  "gitHead": "9795a11a39ed441e034cca9ac50bb3f3ce43ebae"
+  "gitHead": "ec0b19e2d46c7bd89bdeb6ca5cabd4f3ab26a57e"
 }