@blocklet/launcher-workflow 2.3.32 → 2.3.34

package/es/locales/en.js

@@ -113,6 +113,7 @@ export default {
     componentCount: '{count} Component Included',
     componentsCount: '{count} Components Included',
     onDemandNotSupport: 'This app does not support installation in on-demand space, please purchase dedicated space or install in your own dedicated space',
+    freeTrial: 'Free Trial',
     dialog: {
       title: 'Purchase Blocklet Space NFT',
       scan: 'Scan the QR code below with your DID wallet to complete purchase',
@@ -131,7 +132,7 @@ export default {
       notRemind: 'No more reminders'
     },
     productType: {
-      'on-demand': 'On Demand Space',
+      serverless: 'On Demand Space',
       dedicated: 'Dedicated Space'
     },
     paid: {
@@ -156,6 +157,9 @@ export default {
     },
     agreement: '{name} User Agreement',
     estimatedCost: 'Estimated Cost',
-    estimatedCostHint: 'The total cost will vary depending on the actual number and duration of components used in the application. The calculation method is: Unit price of component * Number of components * Duration.'
+    estimatedCostHint: 'The total cost will vary depending on the actual number and duration of components used in the application. The calculation method is: Unit price of component * Number of components * Duration.',
+    freeTrialHint: 'Free trial for {duration}',
+    stakeAmount: 'Stake Amount',
+    stakeHint: 'On-demand spaces operate on a postpaid strategy. You need to stake {amount} for each space. If there are no due invoices when your subscription ends, the staking will be returned to you; otherwise, the staking will be slashed to pay for the due invoices.'
   }
 };

package/es/locales/zh.js

@@ -112,6 +112,7 @@ export default {
     componentCount: '共 {count} 个组件',
     componentsCount: '共 {count} 个组件',
     onDemandNotSupport: '该应用不支持安装在按需空间中，请购买专用空间，或者安装在自己已有的专用空间中',
+    freeTrial: '免费试用',
     dialog: {
       title: '购买 Blocklet Server NFT',
       scan: '用您的 DID 钱包扫描下面的二维码完成购买',
@@ -130,7 +131,7 @@ export default {
       notRemind: '不再提醒'
     },
     productType: {
-      'on-demand': '按需空间',
+      serverless: '按需空间',
       dedicated: '专用空间'
     },
     paid: {
@@ -155,6 +156,9 @@ export default {
     },
     agreement: '{name} 用户协议',
     estimatedCost: '估算成本',
-    estimatedCostHint: '总成本会根据应用实际使用的组件数量和时长而变化，计算方式为: 组件单价*组件数量*时长'
+    estimatedCostHint: '总成本会根据应用实际使用的组件数量和时长而变化，计算方式为: 组件单价*组件数量*时长',
+    freeTrialHint: '免费试用{duration}',
+    stakeAmount: '质押金额',
+    stakeHint: '按需空间采用后付费策略，每个按需空间需要您质押 {amount} 作为服务使用保证金，如果服务结束后没有出现欠费，抵押金将会返还给您；否则会从抵押金中扣除欠费金额。'
   }
 };

package/es/prepare.js

@@ -34,26 +34,13 @@ const Root = styled('div')`
     width: 100%;
   }
 `;
-const isBlockletSupportOnDemand = (blockletMetaUrl, serverlessTrustedSources) => {
-  try {
-    if (!serverlessTrustedSources || serverlessTrustedSources?.length === 0 || !blockletMetaUrl) {
-      return true;
-    }
-    return (serverlessTrustedSources || []).some(item => {
-      const url = new URL(item.url);
-      return url.origin === new URL(blockletMetaUrl).origin;
-    });
-  } catch (error) {
-    // 如果出错，不要阻塞流程
-    console.warn('exception in isBlockletSupportOnDemand', error, blockletMetaUrl, serverlessTrustedSources);
-    return true;
-  }
-};
 function Content({
   blocklet
 }) {
   const [state, setState] = useSetState({
-    productType: 'on-demand'
+    productType: {
+      name: 'serverless'
+    }
   });
   const [params, setParams] = useSearchParams();
   const {
@@ -73,59 +60,76 @@ function Content({
   const navigate = useNavigate();
   const sessionId = params.get('sessionId');
   const blockletMetaUrl = getBlockletMetaUrlFromQuery(params);
-  const defaultProductType = params.get('product_type');
+  const defaultProductTypeName = params.get('product_type');
   const from = params.get('from');
+  const launchState = useAsync(async () => {
+    const createPromiseFn = (fn, ...args) => new Promise((resolve, reject) => {
+      fn(...args, (err, value) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve(value);
+        }
+      });
+    });
+    let launchFn = null;
+    if (sessionId) {
+      launchFn = createPromiseFn(launchSession.load, launchSessionAPI, routerPrefix, sessionId, blockletMetaUrl);
+    } else {
+      launchFn = createPromiseFn(launchSession.create, launchSessionAPI, routerPrefix, blockletMetaUrl);
+    }
+    const metadataFn = launchSessionAPI.get(`/metadata?blockletMetaUrl=${blockletMetaUrl}`).then(res => res.data);
+    const [launch, metadata] = await Promise.all([launchFn, metadataFn]);
+    return {
+      launch,
+      metadata
+    };
+  }, [session.user, blockletMetaUrl]);
   const productTypes = useMemo(() => {
     const result = [];
-    if (isBlockletSupportOnDemand(blockletMetaUrl, window.blocklet?.preferences?.serverlessTrustedSources) === true) {
-      result.push('on-demand');
-    } else {
+    if (launchState.loading) {
+      return result;
+    }
+    if (launchState.value?.metadata?.isBlockletSupportOnDemand === false) {
       Toast.info(t('purchase.onDemandNotSupport'), {
         persist: true
       });
+    } else {
+      const name = 'serverless';
+      result.push({
+        name
+      });
     }
     if (window.blocklet?.preferences?.dedicatedPricingTableId) {
-      result.push('dedicated');
+      const name = 'dedicated';
+      result.push({
+        name
+      });
     }
     return result;
-  }, [blockletMetaUrl, t]);
+  }, [launchState, t]);
   useEffect(() => {
-    const defaultType = productTypes.includes(defaultProductType) ? defaultProductType : productTypes?.[0];
+    const defaultType = productTypes.find(x => x.name === defaultProductTypeName) ? {
+      name: defaultProductTypeName
+    } : productTypes?.[0];
     if (defaultType) {
       setState({
         productType: defaultType
       });
-      params.set('product_type', defaultType);
+      params.set('product_type', defaultType.name);
       setParams(params, {
         replace: true
       });
     }
-  }, [productTypes, defaultProductType, params, setParams, setState]);
-  const launchState = useAsync(async () => {
-    const createPromiseFn = (fn, ...args) => new Promise((resolve, reject) => {
-      fn(...args, (err, value) => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve(value);
-        }
-      });
-    });
-    if (sessionId) {
-      const launch = await createPromiseFn(launchSession.load, launchSessionAPI, routerPrefix, sessionId, blockletMetaUrl);
-      return launch;
-    }
-    const launch = await createPromiseFn(launchSession.create, launchSessionAPI, routerPrefix, blockletMetaUrl);
-    return launch;
-  });
+  }, [productTypes, defaultProductTypeName, params, setParams, setState]);
   const getPurchaseNewLink = useCallback(() => {
-    window.location = launchState?.value?.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?.app?.appURL]);
+  }, [launchState?.value?.launch?.app?.appURL]);
   useEffect(() => {
-    const tmpLaunch = launchState.value;
+    const tmpLaunch = launchState.value?.launch;
     if (!tmpLaunch) {
       return;
     }
@@ -135,7 +139,7 @@ function Content({
         replace: true
       });
     }
-  }, [launchState.value, params, setParams]);
+  }, [launchState.value?.launch, params, setParams]);
   if (launchState.loading || blocklet.loading) {
     return /*#__PURE__*/_jsx(Center, {
       relative: "parent",
@@ -148,14 +152,15 @@ function Content({
   const handlePaid = () => {
     navigate(`/paid?&sessionId=${launch._id}&blocklet_meta_url=${launch.blockletMetaUrl}&from=${from}`);
   };
-  const handleChangeProductType = (a, newProductType) => {
-    if (!newProductType) {
+  const handleChangeProductType = (_, typeName) => {
+    if (!typeName) {
       return;
     }
+    const newProductType = productTypes.find(x => x.name === typeName);
     setState({
       productType: newProductType
     });
-    params.set('product_type', newProductType);
+    params.set('product_type', newProductType.name);
     setParams(params, {
       replace: true
     });
@@ -163,7 +168,7 @@ function Content({
 
   // TODO: PaymentKitV2 处理支付失败的情况
 
-  const launch = launchState.value;
+  const launch = launchState.value?.launch;
   if ([LAUNCH_STATUS.paid, LAUNCH_STATUS.nftMinted, LAUNCH_STATUS.allocated].includes(launch.status)) {
     return /*#__PURE__*/_jsx(ConfirmDialog, {
       title: t('purchase.unexpectedLaunchSession.paid'),
@@ -215,18 +220,23 @@ function Content({
       children: [productTypes.length > 1 && /*#__PURE__*/_jsx(ToggleButtonGroup, {
         orientation: "horizontal",
         color: "primary",
-        value: state.productType,
+        value: state.productType?.name,
         size: "small",
         onChange: handleChangeProductType,
         exclusive: true,
-        children: productTypes.map(type => {
+        sx: {
+          marginTop: '8px'
+        },
+        children: productTypes.map(({
+          name
+        }) => {
           return /*#__PURE__*/_jsx(ToggleButton, {
-            value: type,
+            value: name,
             sx: {
               textTransform: 'capitalize'
             },
-            children: t(`purchase.productType.${type}`)
-          }, type);
+            children: t(`purchase.productType.${name}`)
+          }, name);
         })
       }), /*#__PURE__*/_jsxs(Box, {
         sx: {
@@ -240,7 +250,7 @@ function Content({
             maxWidth: '100%'
           }
         },
-        children: [state.productType === 'on-demand' && /*#__PURE__*/_jsx(CheckoutOnDemand, {
+        children: [state.productType?.name === 'serverless' && /*#__PURE__*/_jsx(CheckoutOnDemand, {
           launchSessionId: sessionId,
           handlePaid: handlePaid,
           components: (blocklet.components || []).map(x => ({
@@ -259,8 +269,10 @@ function Content({
           t: t,
           locale: locale,
           api: launchSessionAPI,
-          checkoutPath: "/payment/checkout"
-        }), state.productType === 'dedicated' && window.blocklet?.preferences?.dedicatedPricingTableId && /*#__PURE__*/_jsx(Box, {
+          freeTrialProducts: launchState.value?.metadata?.freeTrialProducts || [],
+          checkoutPath: "/payment/checkout",
+          minStakeAmount: launchState.value?.metadata?.minStakeAmount
+        }), state.productType?.name === 'dedicated' && window.blocklet?.preferences?.dedicatedPricingTableId && /*#__PURE__*/_jsx(Box, {
           sx: {
             display: 'flex',
             width: '100%',

package/lib/components/checkbox.js

@@ -19,8 +19,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
 var CheckedIcon = function CheckedIcon(props) {
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("svg", _objectSpread(_objectSpread({}, props), {}, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("path", {

package/lib/components/layout/body.js

@@ -17,8 +17,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
 const Body = /*#__PURE__*/(0, _react.forwardRef)(function Body(_ref, ref) {
   let {
       children

package/lib/components/layout/footer.js

@@ -16,8 +16,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
 function Footer(_ref) {
   let {
       children

package/lib/components/layout/index.js

@@ -16,8 +16,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
 function Layout(_ref) {
   let {
       children

package/lib/components/plan.js

@@ -26,8 +26,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
 function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
 var CheckIcon = function CheckIcon(props) {
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("svg", _objectSpread(_objectSpread({}, props), {}, {

package/lib/locales/en.js

@@ -119,6 +119,7 @@ var _default = exports.default = {
     componentCount: '{count} Component Included',
     componentsCount: '{count} Components Included',
     onDemandNotSupport: 'This app does not support installation in on-demand space, please purchase dedicated space or install in your own dedicated space',
+    freeTrial: 'Free Trial',
     dialog: {
       title: 'Purchase Blocklet Space NFT',
       scan: 'Scan the QR code below with your DID wallet to complete purchase',
@@ -137,7 +138,7 @@ var _default = exports.default = {
       notRemind: 'No more reminders'
     },
     productType: {
-      'on-demand': 'On Demand Space',
+      serverless: 'On Demand Space',
       dedicated: 'Dedicated Space'
     },
     paid: {
@@ -162,6 +163,9 @@ var _default = exports.default = {
     },
     agreement: '{name} User Agreement',
     estimatedCost: 'Estimated Cost',
-    estimatedCostHint: 'The total cost will vary depending on the actual number and duration of components used in the application. The calculation method is: Unit price of component * Number of components * Duration.'
+    estimatedCostHint: 'The total cost will vary depending on the actual number and duration of components used in the application. The calculation method is: Unit price of component * Number of components * Duration.',
+    freeTrialHint: 'Free trial for {duration}',
+    stakeAmount: 'Stake Amount',
+    stakeHint: 'On-demand spaces operate on a postpaid strategy. You need to stake {amount} for each space. If there are no due invoices when your subscription ends, the staking will be returned to you; otherwise, the staking will be slashed to pay for the due invoices.'
   }
 };

package/lib/locales/zh.js

@@ -118,6 +118,7 @@ var _default = exports.default = {
     componentCount: '共 {count} 个组件',
     componentsCount: '共 {count} 个组件',
     onDemandNotSupport: '该应用不支持安装在按需空间中，请购买专用空间，或者安装在自己已有的专用空间中',
+    freeTrial: '免费试用',
     dialog: {
       title: '购买 Blocklet Server NFT',
       scan: '用您的 DID 钱包扫描下面的二维码完成购买',
@@ -136,7 +137,7 @@ var _default = exports.default = {
       notRemind: '不再提醒'
     },
     productType: {
-      'on-demand': '按需空间',
+      serverless: '按需空间',
       dedicated: '专用空间'
     },
     paid: {
@@ -161,6 +162,9 @@ var _default = exports.default = {
     },
     agreement: '{name} 用户协议',
     estimatedCost: '估算成本',
-    estimatedCostHint: '总成本会根据应用实际使用的组件数量和时长而变化，计算方式为: 组件单价*组件数量*时长'
+    estimatedCostHint: '总成本会根据应用实际使用的组件数量和时长而变化，计算方式为: 组件单价*组件数量*时长',
+    freeTrialHint: '免费试用{duration}',
+    stakeAmount: '质押金额',
+    stakeHint: '按需空间采用后付费策略，每个按需空间需要您质押 {amount} 作为服务使用保证金，如果服务结束后没有出现欠费，抵押金将会返还给您；否则会从抵押金中扣除欠费金额。'
   }
 };

package/lib/prepare.js

@@ -35,28 +35,15 @@ var _templateObject;
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
 const Root = (0, _styled.default)('div')(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: 100%;\n  height: 100%;\n  padding-top: 0;\n\n  @media (max-width: 960px) {\n    width: 100%;\n  }\n"])));
-const isBlockletSupportOnDemand = (blockletMetaUrl, serverlessTrustedSources) => {
-  try {
-    if (!serverlessTrustedSources || (serverlessTrustedSources === null || serverlessTrustedSources === void 0 ? void 0 : serverlessTrustedSources.length) === 0 || !blockletMetaUrl) {
-      return true;
-    }
-    return (serverlessTrustedSources || []).some(item => {
-      const url = new URL(item.url);
-      return url.origin === new URL(blockletMetaUrl).origin;
-    });
-  } catch (error) {
-    // 如果出错，不要阻塞流程
-    console.warn('exception in isBlockletSupportOnDemand', error, blockletMetaUrl, serverlessTrustedSources);
-    return true;
-  }
-};
 function Content(_ref) {
-  var _launchState$value2, _ref2, _window$blocklet3, _window$blocklet4, _window$blocklet5;
+  var _launchState$value3, _launchState$value5, _launchState$value6, _state$productType, _state$productType2, _ref3, _launchState$value7, _launchState$value8, _state$productType3, _window$blocklet2, _window$blocklet3, _window$blocklet4;
   let {
     blocklet
   } = _ref;
   const [state, setState] = (0, _useSetState.default)({
-    productType: 'on-demand'
+    productType: {
+      name: 'serverless'
+    }
   });
   const [params, setParams] = (0, _reactRouterDom.useSearchParams)();
   const {
@@ -76,35 +63,8 @@ function Content(_ref) {
   const navigate = (0, _reactRouterDom.useNavigate)();
   const sessionId = params.get('sessionId');
   const blockletMetaUrl = (0, _util.getBlockletMetaUrlFromQuery)(params);
-  const defaultProductType = params.get('product_type');
+  const defaultProductTypeName = params.get('product_type');
   const from = params.get('from');
-  const productTypes = (0, _react.useMemo)(() => {
-    var _window$blocklet, _window$blocklet2;
-    const result = [];
-    if (isBlockletSupportOnDemand(blockletMetaUrl, (_window$blocklet = window.blocklet) === null || _window$blocklet === void 0 || (_window$blocklet = _window$blocklet.preferences) === null || _window$blocklet === void 0 ? void 0 : _window$blocklet.serverlessTrustedSources) === true) {
-      result.push('on-demand');
-    } else {
-      _Toast.default.info(t('purchase.onDemandNotSupport'), {
-        persist: true
-      });
-    }
-    if ((_window$blocklet2 = window.blocklet) !== null && _window$blocklet2 !== void 0 && (_window$blocklet2 = _window$blocklet2.preferences) !== null && _window$blocklet2 !== void 0 && _window$blocklet2.dedicatedPricingTableId) {
-      result.push('dedicated');
-    }
-    return result;
-  }, [blockletMetaUrl, t]);
-  (0, _react.useEffect)(() => {
-    const defaultType = productTypes.includes(defaultProductType) ? defaultProductType : productTypes === null || productTypes === void 0 ? void 0 : productTypes[0];
-    if (defaultType) {
-      setState({
-        productType: defaultType
-      });
-      params.set('product_type', defaultType);
-      setParams(params, {
-        replace: true
-      });
-    }
-  }, [productTypes, defaultProductType, params, setParams, setState]);
   const launchState = (0, _useAsync.default)(async () => {
     const createPromiseFn = function createPromiseFn(fn) {
       for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -120,22 +80,67 @@ function Content(_ref) {
         });
       });
     };
+    let launchFn = null;
     if (sessionId) {
-      const launch = await createPromiseFn(_util2.launchSession.load, launchSessionAPI, routerPrefix, sessionId, blockletMetaUrl);
-      return launch;
+      launchFn = createPromiseFn(_util2.launchSession.load, launchSessionAPI, routerPrefix, sessionId, blockletMetaUrl);
+    } else {
+      launchFn = createPromiseFn(_util2.launchSession.create, launchSessionAPI, routerPrefix, blockletMetaUrl);
     }
-    const launch = await createPromiseFn(_util2.launchSession.create, launchSessionAPI, routerPrefix, blockletMetaUrl);
-    return launch;
-  });
+    const metadataFn = launchSessionAPI.get("/metadata?blockletMetaUrl=".concat(blockletMetaUrl)).then(res => res.data);
+    const [launch, metadata] = await Promise.all([launchFn, metadataFn]);
+    return {
+      launch,
+      metadata
+    };
+  }, [session.user, blockletMetaUrl]);
+  const productTypes = (0, _react.useMemo)(() => {
+    var _launchState$value, _window$blocklet;
+    const result = [];
+    if (launchState.loading) {
+      return result;
+    }
+    if (((_launchState$value = launchState.value) === null || _launchState$value === void 0 || (_launchState$value = _launchState$value.metadata) === null || _launchState$value === void 0 ? void 0 : _launchState$value.isBlockletSupportOnDemand) === false) {
+      _Toast.default.info(t('purchase.onDemandNotSupport'), {
+        persist: true
+      });
+    } else {
+      const name = 'serverless';
+      result.push({
+        name
+      });
+    }
+    if ((_window$blocklet = window.blocklet) !== null && _window$blocklet !== void 0 && (_window$blocklet = _window$blocklet.preferences) !== null && _window$blocklet !== void 0 && _window$blocklet.dedicatedPricingTableId) {
+      const name = 'dedicated';
+      result.push({
+        name
+      });
+    }
+    return result;
+  }, [launchState, t]);
+  (0, _react.useEffect)(() => {
+    const defaultType = productTypes.find(x => x.name === defaultProductTypeName) ? {
+      name: defaultProductTypeName
+    } : productTypes === null || productTypes === void 0 ? void 0 : productTypes[0];
+    if (defaultType) {
+      setState({
+        productType: defaultType
+      });
+      params.set('product_type', defaultType.name);
+      setParams(params, {
+        replace: true
+      });
+    }
+  }, [productTypes, defaultProductTypeName, params, setParams, setState]);
   const getPurchaseNewLink = (0, _react.useCallback)(() => {
-    var _launchState$value;
-    window.location = launchState === null || launchState === void 0 || (_launchState$value = launchState.value) === null || _launchState$value === void 0 || (_launchState$value = _launchState$value.app) === null || _launchState$value === void 0 ? void 0 : _launchState$value.appURL;
+    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;
     const urlObj = new URL(window.location.href);
     urlObj.searchParams.delete('sessionId');
     return urlObj.href;
-  }, [launchState === null || launchState === void 0 || (_launchState$value2 = launchState.value) === null || _launchState$value2 === void 0 || (_launchState$value2 = _launchState$value2.app) === null || _launchState$value2 === void 0 ? void 0 : _launchState$value2.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)(() => {
-    const tmpLaunch = launchState.value;
+    var _launchState$value4;
+    const tmpLaunch = (_launchState$value4 = launchState.value) === null || _launchState$value4 === void 0 ? void 0 : _launchState$value4.launch;
     if (!tmpLaunch) {
       return;
     }
@@ -145,7 +150,7 @@ function Content(_ref) {
         replace: true
       });
     }
-  }, [launchState.value, params, setParams]);
+  }, [(_launchState$value5 = launchState.value) === null || _launchState$value5 === void 0 ? void 0 : _launchState$value5.launch, params, setParams]);
   if (launchState.loading || blocklet.loading) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Center.default, {
       relative: "parent",
@@ -158,14 +163,15 @@ function Content(_ref) {
   const handlePaid = () => {
     navigate("/paid?&sessionId=".concat(launch._id, "&blocklet_meta_url=").concat(launch.blockletMetaUrl, "&from=").concat(from));
   };
-  const handleChangeProductType = (a, newProductType) => {
-    if (!newProductType) {
+  const handleChangeProductType = (_, typeName) => {
+    if (!typeName) {
       return;
     }
+    const newProductType = productTypes.find(x => x.name === typeName);
     setState({
       productType: newProductType
     });
-    params.set('product_type', newProductType);
+    params.set('product_type', newProductType.name);
     setParams(params, {
       replace: true
     });
@@ -173,7 +179,7 @@ function Content(_ref) {
 
   // TODO: PaymentKitV2 处理支付失败的情况
 
-  const launch = launchState.value;
+  const launch = (_launchState$value6 = launchState.value) === null || _launchState$value6 === void 0 ? void 0 : _launchState$value6.launch;
   if ([_constant.LAUNCH_STATUS.paid, _constant.LAUNCH_STATUS.nftMinted, _constant.LAUNCH_STATUS.allocated].includes(launch.status)) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.default, {
       title: t('purchase.unexpectedLaunchSession.paid'),
@@ -226,18 +232,24 @@ function Content(_ref) {
       children: [productTypes.length > 1 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleButtonGroup.default, {
         orientation: "horizontal",
         color: "primary",
-        value: state.productType,
+        value: (_state$productType = state.productType) === null || _state$productType === void 0 ? void 0 : _state$productType.name,
         size: "small",
         onChange: handleChangeProductType,
         exclusive: true,
-        children: productTypes.map(type => {
+        sx: {
+          marginTop: '8px'
+        },
+        children: productTypes.map(_ref2 => {
+          let {
+            name
+          } = _ref2;
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleButton.default, {
-            value: type,
+            value: name,
             sx: {
               textTransform: 'capitalize'
             },
-            children: t("purchase.productType.".concat(type))
-          }, type);
+            children: t("purchase.productType.".concat(name))
+          }, name);
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
         sx: {
@@ -251,7 +263,7 @@ function Content(_ref) {
             maxWidth: '100%'
           }
         },
-        children: [state.productType === 'on-demand' && /*#__PURE__*/(0, _jsxRuntime.jsx)(_onDemand.default, {
+        children: [((_state$productType2 = state.productType) === null || _state$productType2 === void 0 ? void 0 : _state$productType2.name) === 'serverless' && /*#__PURE__*/(0, _jsxRuntime.jsx)(_onDemand.default, {
           launchSessionId: sessionId,
           handlePaid: handlePaid,
           components: (blocklet.components || []).map(x => ({
@@ -264,14 +276,16 @@ function Content(_ref) {
               logoPath: x.meta.logo
             })
           })),
-          blockletStoreURL: (_ref2 = from !== 'did-spaces') !== null && _ref2 !== void 0 ? _ref2 : blocklet.registryUrl,
+          blockletStoreURL: (_ref3 = from !== 'did-spaces') !== null && _ref3 !== void 0 ? _ref3 : blocklet.registryUrl,
           connectApi: connectApi,
           session: session,
           t: t,
           locale: locale,
           api: launchSessionAPI,
-          checkoutPath: "/payment/checkout"
-        }), state.productType === 'dedicated' && ((_window$blocklet3 = window.blocklet) === null || _window$blocklet3 === void 0 || (_window$blocklet3 = _window$blocklet3.preferences) === null || _window$blocklet3 === void 0 ? void 0 : _window$blocklet3.dedicatedPricingTableId) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+          freeTrialProducts: ((_launchState$value7 = launchState.value) === null || _launchState$value7 === void 0 || (_launchState$value7 = _launchState$value7.metadata) === null || _launchState$value7 === void 0 ? void 0 : _launchState$value7.freeTrialProducts) || [],
+          checkoutPath: "/payment/checkout",
+          minStakeAmount: (_launchState$value8 = launchState.value) === null || _launchState$value8 === void 0 || (_launchState$value8 = _launchState$value8.metadata) === null || _launchState$value8 === void 0 ? void 0 : _launchState$value8.minStakeAmount
+        }), ((_state$productType3 = state.productType) === null || _state$productType3 === void 0 ? void 0 : _state$productType3.name) === 'dedicated' && ((_window$blocklet2 = window.blocklet) === null || _window$blocklet2 === void 0 || (_window$blocklet2 = _window$blocklet2.preferences) === null || _window$blocklet2 === void 0 ? void 0 : _window$blocklet2.dedicatedPricingTableId) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
           sx: {
             display: 'flex',
             width: '100%',
@@ -308,13 +322,13 @@ function Content(_ref) {
             session: session,
             connect: connectApi,
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_paymentReact.CheckoutTable, {
-              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,
+              id: (_window$blocklet3 = window.blocklet) === null || _window$blocklet3 === void 0 || (_window$blocklet3 = _window$blocklet3.preferences) === null || _window$blocklet3 === void 0 ? void 0 : _window$blocklet3.dedicatedPricingTableId,
               mode: "inline",
               extraParams: {
                 'metadata.session_id': launch._id,
                 'subscription_data.trial_end': (0, _util.getDefaultTrialEnd)(),
                 '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
+                'subscription_data.days_until_cancel': ((_window$blocklet4 = window.blocklet) === null || _window$blocklet4 === void 0 || (_window$blocklet4 = _window$blocklet4.preferences) === null || _window$blocklet4 === void 0 ? void 0 : _window$blocklet4.daysUntilCancel) || 30
               },
               onPaid: handlePaid
             })
@@ -342,10 +356,10 @@ function Content(_ref) {
     })
   });
 }
-function PreparePage(_ref3) {
+function PreparePage(_ref4) {
   let {
     blocklet
-  } = _ref3;
+  } = _ref4;
   const {
     t
   } = (0, _locale.useLocaleContext)();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "2.3.32",
+  "version": "2.3.34",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -41,22 +41,22 @@
     "react": ">=18.1.0"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.10.3",
-    "@arcblock/icons": "^2.10.3",
-    "@arcblock/license": "^2.10.3",
-    "@arcblock/react-hooks": "^2.10.3",
-    "@arcblock/ux": "^2.10.3",
-    "@blocklet/launcher-layout": "2.3.32",
-    "@blocklet/launcher-util": "2.3.32",
-    "@blocklet/launcher-ux": "2.3.32",
-    "@blocklet/payment": "^1.13.289",
-    "@blocklet/payment-react": "^1.13.289",
-    "@emotion/react": "^11.11.4",
-    "@emotion/styled": "^11.11.5",
-    "@mui/icons-material": "^5.15.21",
-    "@mui/lab": "^5.0.0-alpha.170",
-    "@mui/material": "^5.15.21",
-    "@ocap/util": "^1.18.124",
+    "@arcblock/did-connect": "^2.10.9",
+    "@arcblock/icons": "^2.10.9",
+    "@arcblock/license": "^2.10.9",
+    "@arcblock/react-hooks": "^2.10.9",
+    "@arcblock/ux": "^2.10.9",
+    "@blocklet/launcher-layout": "2.3.34",
+    "@blocklet/launcher-util": "2.3.34",
+    "@blocklet/launcher-ux": "2.3.34",
+    "@blocklet/payment": "^1.14.5",
+    "@blocklet/payment-react": "^1.14.5",
+    "@emotion/react": "^11.13.0",
+    "@emotion/styled": "^11.13.0",
+    "@mui/icons-material": "^5.16.5",
+    "@mui/lab": "^5.0.0-alpha.173",
+    "@mui/material": "^5.16.5",
+    "@ocap/util": "^1.18.126",
     "@splidejs/react-splide": "^0.7.12",
     "@splidejs/splide": "^4.1.4",
     "@splidejs/splide-extension-grid": "^0.4.1",
@@ -75,17 +75,17 @@
     "moment": "^2.30.1",
     "prop-types": "^15.8.1",
     "react-lottie-player": "^1.5.6",
-    "react-router-dom": "^6.24.0",
-    "react-use": "^17.5.0",
+    "react-router-dom": "^6.25.1",
+    "react-use": "^17.5.1",
     "url-join": "^4.0.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.24.7",
-    "@babel/core": "^7.24.7",
-    "@babel/preset-env": "^7.24.7",
+    "@babel/cli": "^7.24.8",
+    "@babel/core": "^7.24.9",
+    "@babel/preset-env": "^7.25.0",
     "@babel/preset-react": "^7.24.7",
     "babel-plugin-inline-react-svg": "^2.0.2",
-    "glob": "^10.4.2"
+    "glob": "^10.4.5"
   },
   "exports": {
     ".": {
@@ -105,5 +105,5 @@
       "require": "./lib/locales/index.js"
     }
   },
-  "gitHead": "9f5402fdad12728aa1316e4d039dc4f30b7e5daf"
+  "gitHead": "54c8d4db562dd766ed25c2adb05b00f4430d2083"
 }