@blocklet/launcher-workflow 2.3.80 → 2.3.81

package/es/components/in-progress-session.js

@@ -31,7 +31,7 @@ export default function InProgressSession() {
       data
     } = await api.get(joinURL(routerPrefix, '/launches/in-progress'));
     if (data.launch) {
-      if (localStorage.getItem(IGNORE_LAUNCH_SESSION_KEY) === data.launch._id) {
+      if (localStorage.getItem(IGNORE_LAUNCH_SESSION_KEY) === data.launch.id) {
         return null;
       }
       setOpen(true);
@@ -47,7 +47,7 @@ export default function InProgressSession() {
   }
   const handleClose = () => {
     setOpen(false);
-    localStorage.setItem(IGNORE_LAUNCH_SESSION_KEY, state.value._id);
+    localStorage.setItem(IGNORE_LAUNCH_SESSION_KEY, state.value.id);
   };
   let continueBaseURL = '';
   try {

package/es/components/launch-dedicated.js

@@ -2,6 +2,7 @@ import AnimationWaiter from '@arcblock/ux/lib/AnimationWaiter';
 import Button from '@arcblock/ux/lib/Button';
 import Toast from '@arcblock/ux/lib/Toast';
 import { INSTANCE_STATUS } from '@blocklet/launcher-util/es/constant';
+import { LAUNCH_STATUS } from '@blocklet/launcher-util/lib/constant';
 import styled from '@emotion/styled';
 import Spinner from '@mui/material/CircularProgress';
 import { useSetState } from 'ahooks';
@@ -58,7 +59,7 @@ export default function LaunchDedicated({
   const handleInstance = instance => {
     if (instance.status >= INSTANCE_STATUS.running) {
       const url = getLaunchBlockletUrl({
-        serverUrl: instance.adminURL,
+        serverUrl: instance.appInfo?.adminURL || instance.appUrl,
         blockletMetaUrl,
         locale,
         chainHost: window.blocklet?.CHAIN_HOST,
@@ -84,6 +85,15 @@ export default function LaunchDedicated({
       setLaunchState({
         status: STATUS.launching
       });
+      const {
+        data: {
+          launch: launchSession
+        }
+      } = await api.get(`/launches/${sessionId}`);
+      if (launchSession.status >= LAUNCH_STATUS.installed) {
+        handleInstance(launchSession.instance);
+        return;
+      }
       const {
         data: {
           instance
@@ -96,7 +106,7 @@ export default function LaunchDedicated({
         }
       });
       setLaunchState({
-        instanceId: instance._id
+        instanceId: instance.id
       });
       handleInstance(instance);
     } catch (err) {
@@ -107,6 +117,9 @@ export default function LaunchDedicated({
       } else {
         Toast.error(errDesc);
       }
+      setLaunchState({
+        status: STATUS.error
+      });
     }
   };
   const getInstanceStatus = async () => {
@@ -235,6 +248,7 @@ const WaiterContainer = styled.div`
 const Content = styled.div`
   margin: auto;
   height: 100%;
+  overflow: hidden;
 
   .link {
     color: ${props => props.theme.palette.primary.main};

package/es/components/launch-serverless.js

@@ -32,11 +32,11 @@ export default function LaunchServerless({
     });
     setTimeout(() => {
       window.location = getLaunchBlockletUrl({
-        serverUrl: instance.adminURL,
+        serverUrl: instance.serverUrl,
         blockletMetaUrl: searchParams.get('blocklet_meta_url'),
         locale,
         launchType: 'serverless',
-        nftId: instance.nftId,
+        nftDid: instance.nftDid,
         sessionId,
         chainHost: window.blocklet?.CHAIN_HOST,
         from: searchParams.get('from')

package/es/paid.js

@@ -38,7 +38,7 @@ export default function PurchaseSuccess() {
     if (data?.status >= LAUNCH_STATUS.nftMinted) {
       params.set('launchType', data.type);
       navigate({
-        pathname: joinURL(routerPrefix, `/launch/${data._id}`),
+        pathname: joinURL(routerPrefix, `/launch/${data.id}`),
         search: params.toString()
       });
     }

package/es/prepare.js

@@ -145,18 +145,18 @@ function Content({
     }
   }, [productTypes, defaultProductTypeName, params, setParams, setState]);
   const getPurchaseNewLink = useCallback(() => {
-    window.location = launchState?.value?.launch?.app?.appURL;
+    window.location = launchState?.value?.launch?.app?.appUrl;
     const urlObj = new URL(window.location.href);
     urlObj.searchParams.delete('sessionId');
     return urlObj.href;
-  }, [launchState?.value?.launch?.app?.appURL]);
+  }, [launchState?.value?.launch?.app?.appUrl]);
   useEffect(() => {
     const tmpLaunch = launchState.value?.launch;
     if (!tmpLaunch) {
       return;
     }
-    if (tmpLaunch._id !== params.get('sessionId')) {
-      params.set('sessionId', tmpLaunch._id);
+    if (tmpLaunch.id !== params.get('sessionId')) {
+      params.set('sessionId', tmpLaunch.id);
       setParams(params, {
         replace: true
       });
@@ -172,7 +172,7 @@ function Content({
     return t('common.serviceError');
   }
   const handlePaid = () => {
-    navigate(`/paid?&sessionId=${launch._id}&blocklet_meta_url=${launch.blockletMetaUrl}&from=${from}`);
+    navigate(`/paid?&sessionId=${launch.id}&blocklet_meta_url=${launch.blockletMetaUrl}&from=${from}`);
   };
   const handleChangeProductType = (_, typeName) => {
     if (!typeName) {
@@ -215,7 +215,7 @@ function Content({
         window.location = getPurchaseNewLink();
       },
       onConfirm: () => {
-        window.location = getBlockletAdminURL(launch?.app?.appURL);
+        window.location = getBlockletAdminURL(launch?.app?.appUrl);
       }
     });
   }
@@ -338,7 +338,7 @@ function Content({
               id: window.blocklet?.preferences?.dedicatedPricingTableId,
               mode: "inline",
               extraParams: {
-                'metadata.session_id': launch._id,
+                'metadata.session_id': launch.id,
                 'subscription_data.days_until_due': 0,
                 'subscription_data.days_until_cancel': window.blocklet?.preferences?.daysUntilCancel || 30
               },

package/es/util.js

@@ -15,7 +15,7 @@ export const getLaunchBlockletUrl = ({
   blockletMetaUrl,
   locale,
   launchType,
-  nftId,
+  nftDid,
   sessionId,
   chainHost,
   from
@@ -34,8 +34,8 @@ export const getLaunchBlockletUrl = ({
   if (locale) {
     result += `&locale=${locale}`;
   }
-  if (nftId) {
-    result += `&nftId=${nftId}`;
+  if (nftDid) {
+    result += `&nftId=${nftDid}`;
   }
   if (sessionId) {
     result += `&launcherSessionId=${sessionId}`;

package/lib/components/in-progress-session.js

@@ -38,7 +38,7 @@ function InProgressSession() {
       data
     } = await api.get((0, _urlJoin.default)(routerPrefix, '/launches/in-progress'));
     if (data.launch) {
-      if (localStorage.getItem(IGNORE_LAUNCH_SESSION_KEY) === data.launch._id) {
+      if (localStorage.getItem(IGNORE_LAUNCH_SESSION_KEY) === data.launch.id) {
         return null;
       }
       setOpen(true);
@@ -54,7 +54,7 @@ function InProgressSession() {
   }
   const handleClose = () => {
     setOpen(false);
-    localStorage.setItem(IGNORE_LAUNCH_SESSION_KEY, state.value._id);
+    localStorage.setItem(IGNORE_LAUNCH_SESSION_KEY, state.value.id);
   };
   let continueBaseURL = '';
   try {

package/lib/components/launch-dedicated.js

@@ -8,6 +8,7 @@ var _AnimationWaiter = _interopRequireDefault(require("@arcblock/ux/lib/Animatio
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _constant = require("@blocklet/launcher-util/es/constant");
+var _constant2 = require("@blocklet/launcher-util/lib/constant");
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _ahooks = require("ahooks");
@@ -67,9 +68,9 @@ function LaunchDedicated(_ref) {
   }
   const handleInstance = instance => {
     if (instance.status >= _constant.INSTANCE_STATUS.running) {
-      var _window$blocklet;
+      var _instance$appInfo, _window$blocklet;
       const url = (0, _util.getLaunchBlockletUrl)({
-        serverUrl: instance.adminURL,
+        serverUrl: ((_instance$appInfo = instance.appInfo) === null || _instance$appInfo === void 0 ? void 0 : _instance$appInfo.adminURL) || instance.appUrl,
         blockletMetaUrl,
         locale,
         chainHost: (_window$blocklet = window.blocklet) === null || _window$blocklet === void 0 ? void 0 : _window$blocklet.CHAIN_HOST,
@@ -95,6 +96,15 @@ function LaunchDedicated(_ref) {
       setLaunchState({
         status: STATUS.launching
       });
+      const {
+        data: {
+          launch: launchSession
+        }
+      } = await api.get("/launches/".concat(sessionId));
+      if (launchSession.status >= _constant2.LAUNCH_STATUS.installed) {
+        handleInstance(launchSession.instance);
+        return;
+      }
       const {
         data: {
           instance
@@ -107,7 +117,7 @@ function LaunchDedicated(_ref) {
         }
       });
       setLaunchState({
-        instanceId: instance._id
+        instanceId: instance.id
       });
       handleInstance(instance);
     } catch (err) {
@@ -118,6 +128,9 @@ function LaunchDedicated(_ref) {
       } else {
         _Toast.default.error(errDesc);
       }
+      setLaunchState({
+        status: STATUS.error
+      });
     }
   };
   const getInstanceStatus = async () => {
@@ -235,7 +248,7 @@ function LaunchDedicated(_ref) {
 }
 const LinkEle = _styled.default.a(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  height: 36px;\n  color: ", ";\n"])), props => props.theme.palette.primary.main);
 const WaiterContainer = _styled.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  color: #1dc1c7;\n"])));
-const Content = _styled.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  margin: auto;\n  height: 100%;\n\n  .link {\n    color: ", ";\n  }\n\n  .link:hover {\n    text-decoration: underline !important;\n  }\n\n  .status {\n    color: ", ";\n    display: flex;\n    flex-direction: column;\n    align-items: center;\n\n    .status-spinner {\n      color: inherit !important;\n    }\n\n    .status-text {\n      display: inline-block;\n      padding: 0 20px;\n      max-width: 420px;\n      margin-top: 24px;\n      text-align: center;\n    }\n  }\n\n  .button {\n    min-width: 150px;\n    margin-bottom: 100px;\n  }\n  .center {\n    display: flex;\n    align-items: center;\n    justify-content: center;\n    width: 100%;\n    height: 100%;\n  }\n  .launch-page-header {\n    transition: all ease 0.3s;\n  }\n"])), props => props.theme.palette.primary.main, props => props.theme.palette.primary.main);
+const Content = _styled.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  margin: auto;\n  height: 100%;\n  overflow: hidden;\n\n  .link {\n    color: ", ";\n  }\n\n  .link:hover {\n    text-decoration: underline !important;\n  }\n\n  .status {\n    color: ", ";\n    display: flex;\n    flex-direction: column;\n    align-items: center;\n\n    .status-spinner {\n      color: inherit !important;\n    }\n\n    .status-text {\n      display: inline-block;\n      padding: 0 20px;\n      max-width: 420px;\n      margin-top: 24px;\n      text-align: center;\n    }\n  }\n\n  .button {\n    min-width: 150px;\n    margin-bottom: 100px;\n  }\n  .center {\n    display: flex;\n    align-items: center;\n    justify-content: center;\n    width: 100%;\n    height: 100%;\n  }\n  .launch-page-header {\n    transition: all ease 0.3s;\n  }\n"])), props => props.theme.palette.primary.main, props => props.theme.palette.primary.main);
 LaunchDedicated.propTypes = {
   sessionId: _propTypes.default.string.isRequired,
   type: _propTypes.default.oneOf(['launch', 'start'])

package/lib/components/launch-serverless.js

@@ -43,11 +43,11 @@ function LaunchServerless(_ref) {
     setTimeout(() => {
       var _window$blocklet;
       window.location = (0, _util.getLaunchBlockletUrl)({
-        serverUrl: instance.adminURL,
+        serverUrl: instance.serverUrl,
         blockletMetaUrl: searchParams.get('blocklet_meta_url'),
         locale,
         launchType: 'serverless',
-        nftId: instance.nftId,
+        nftDid: instance.nftDid,
         sessionId,
         chainHost: (_window$blocklet = window.blocklet) === null || _window$blocklet === void 0 ? void 0 : _window$blocklet.CHAIN_HOST,
         from: searchParams.get('from')

package/lib/paid.js

@@ -48,7 +48,7 @@ function PurchaseSuccess() {
     if ((data === null || data === void 0 ? void 0 : data.status) >= _constant.LAUNCH_STATUS.nftMinted) {
       params.set('launchType', data.type);
       navigate({
-        pathname: (0, _urlJoin.default)(routerPrefix, "/launch/".concat(data._id)),
+        pathname: (0, _urlJoin.default)(routerPrefix, "/launch/".concat(data.id)),
         search: params.toString()
       });
     }

package/lib/prepare.js

@@ -156,19 +156,19 @@ function Content(_ref) {
   }, [productTypes, defaultProductTypeName, params, setParams, setState]);
   const getPurchaseNewLink = (0, _react.useCallback)(() => {
     var _launchState$value2;
-    window.location = launchState === null || launchState === void 0 || (_launchState$value2 = launchState.value) === null || _launchState$value2 === void 0 || (_launchState$value2 = _launchState$value2.launch) === null || _launchState$value2 === void 0 || (_launchState$value2 = _launchState$value2.app) === null || _launchState$value2 === void 0 ? void 0 : _launchState$value2.appURL;
+    window.location = launchState === null || launchState === void 0 || (_launchState$value2 = launchState.value) === null || _launchState$value2 === void 0 || (_launchState$value2 = _launchState$value2.launch) === null || _launchState$value2 === void 0 || (_launchState$value2 = _launchState$value2.app) === null || _launchState$value2 === void 0 ? void 0 : _launchState$value2.appUrl;
     const urlObj = new URL(window.location.href);
     urlObj.searchParams.delete('sessionId');
     return urlObj.href;
-  }, [launchState === null || launchState === void 0 || (_launchState$value3 = launchState.value) === null || _launchState$value3 === void 0 || (_launchState$value3 = _launchState$value3.launch) === null || _launchState$value3 === void 0 || (_launchState$value3 = _launchState$value3.app) === null || _launchState$value3 === void 0 ? void 0 : _launchState$value3.appURL]);
+  }, [launchState === null || launchState === void 0 || (_launchState$value3 = launchState.value) === null || _launchState$value3 === void 0 || (_launchState$value3 = _launchState$value3.launch) === null || _launchState$value3 === void 0 || (_launchState$value3 = _launchState$value3.app) === null || _launchState$value3 === void 0 ? void 0 : _launchState$value3.appUrl]);
   (0, _react.useEffect)(() => {
     var _launchState$value4;
     const tmpLaunch = (_launchState$value4 = launchState.value) === null || _launchState$value4 === void 0 ? void 0 : _launchState$value4.launch;
     if (!tmpLaunch) {
       return;
     }
-    if (tmpLaunch._id !== params.get('sessionId')) {
-      params.set('sessionId', tmpLaunch._id);
+    if (tmpLaunch.id !== params.get('sessionId')) {
+      params.set('sessionId', tmpLaunch.id);
       setParams(params, {
         replace: true
       });
@@ -184,7 +184,7 @@ function Content(_ref) {
     return t('common.serviceError');
   }
   const handlePaid = () => {
-    navigate("/paid?&sessionId=".concat(launch._id, "&blocklet_meta_url=").concat(launch.blockletMetaUrl, "&from=").concat(from));
+    navigate("/paid?&sessionId=".concat(launch.id, "&blocklet_meta_url=").concat(launch.blockletMetaUrl, "&from=").concat(from));
   };
   const handleChangeProductType = (_, typeName) => {
     if (!typeName) {
@@ -228,7 +228,7 @@ function Content(_ref) {
       },
       onConfirm: () => {
         var _launch$app;
-        window.location = (0, _util.getBlockletAdminURL)(launch === null || launch === void 0 || (_launch$app = launch.app) === null || _launch$app === void 0 ? void 0 : _launch$app.appURL);
+        window.location = (0, _util.getBlockletAdminURL)(launch === null || launch === void 0 || (_launch$app = launch.app) === null || _launch$app === void 0 ? void 0 : _launch$app.appUrl);
       }
     });
   }
@@ -353,7 +353,7 @@ function Content(_ref) {
               id: (_window$blocklet4 = window.blocklet) === null || _window$blocklet4 === void 0 || (_window$blocklet4 = _window$blocklet4.preferences) === null || _window$blocklet4 === void 0 ? void 0 : _window$blocklet4.dedicatedPricingTableId,
               mode: "inline",
               extraParams: {
-                'metadata.session_id': launch._id,
+                'metadata.session_id': launch.id,
                 'subscription_data.days_until_due': 0,
                 'subscription_data.days_until_cancel': ((_window$blocklet5 = window.blocklet) === null || _window$blocklet5 === void 0 || (_window$blocklet5 = _window$blocklet5.preferences) === null || _window$blocklet5 === void 0 ? void 0 : _window$blocklet5.daysUntilCancel) || 30
               },

package/lib/util.js

@@ -25,7 +25,7 @@ const getLaunchBlockletUrl = _ref => {
     blockletMetaUrl,
     locale,
     launchType,
-    nftId,
+    nftDid,
     sessionId,
     chainHost,
     from
@@ -44,8 +44,8 @@ const getLaunchBlockletUrl = _ref => {
   if (locale) {
     result += "&locale=".concat(locale);
   }
-  if (nftId) {
-    result += "&nftId=".concat(nftId);
+  if (nftDid) {
+    result += "&nftId=".concat(nftDid);
   }
   if (sessionId) {
     result += "&launcherSessionId=".concat(sessionId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "2.3.80",
+  "version": "2.3.81",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -47,8 +47,8 @@
     "@arcblock/react-hooks": "^2.10.81",
     "@arcblock/ux": "^2.10.81",
     "@blocklet/launcher-layout": "^2.10.81",
-    "@blocklet/launcher-util": "2.3.80",
-    "@blocklet/launcher-ux": "2.3.80",
+    "@blocklet/launcher-util": "2.3.81",
+    "@blocklet/launcher-ux": "2.3.81",
     "@blocklet/payment": "^1.14.8",
     "@blocklet/payment-react": "^1.16.10",
     "@emotion/react": "^11.13.5",
@@ -105,5 +105,5 @@
       "require": "./lib/locales/index.js"
     }
   },
-  "gitHead": "b47a4f9834cbc3a0c6c18b622d107e8b9153faae"
+  "gitHead": "8ecafb12bc2f29364cd0488a7f3c5b6ccb4d212c"
 }