@abtnode/ux 1.16.15-beta-e3a24907 → 1.16.15-beta-18951729

package/es/blocklet/router/action/add-domain-alias.js

@@ -6,11 +6,10 @@ import Typography from '@mui/material/Typography';
 import TextField from '@mui/material/TextField';
 import MenuItem from '@mui/material/MenuItem';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import Toast from '@arcblock/ux/lib/Toast';
 import Confirm from '../../../confirm';
 import { formatError, sleep } from '../../../util';
 import { useNodeContext } from '../../../contexts/node';
-import { validateDomain } from '../util';
+import { parseDomainFromURL, validateDomain } from '../util';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -41,15 +40,13 @@ export default function AddDomainAlias({
       await api.addDomainAlias({
         input: {
           id,
-          domainAlias: params.domain.trim(),
+          domainAlias: parseDomainFromURL(params.domain),
           teamDid
         }
       });
       await sleep(2000);
-    } catch (err) {
-      Toast.error(err.message);
-    } finally {
       setConfirmSetting(null);
+    } finally {
       setLoading(false);
     }
   };
@@ -69,6 +66,7 @@ export default function AddDomainAlias({
       component: "div",
       children: /*#__PURE__*/_jsx(TextField, {
         label: t('router.domainAlias.add.domainDescription'),
+        helperText: t('router.domainAlias.add.helperText'),
         autoComplete: "off",
         variant: "outlined",
         name: "domain",

package/es/blocklet/router/util.js

@@ -128,4 +128,20 @@ export const isSpecialDomain = name => {
     specialDomains.push(window.location.hostname);
   }
   return specialDomains.includes(name);
+};
+export const parseDomainFromURL = tmpDomain => {
+  if (!tmpDomain || typeof tmpDomain !== 'string') {
+    return tmpDomain;
+  }
+  let domain = tmpDomain.trim();
+  try {
+    domain = domain.toLowerCase();
+    if (domain.startsWith('http://') || domain.startsWith('https://')) {
+      return new URL(domain).hostname;
+    }
+    return domain;
+  } catch (error) {
+    console.error('format domain failed', error);
+    return domain;
+  }
 };

package/es/locales/en.js

@@ -820,13 +820,14 @@ module.exports = {
       rewriteUrlRequired: 'Rewrite URL is required'
     },
     domain: {
+      addSite: 'Add Site',
       validate: {
         emptyTip: 'Site domain cannot be empty',
         suffixTip: 'Site domain cannot include {suffix}'
       },
       add: {
-        title: 'Add Site',
-        description: 'Please provide a valid site name address',
+        title: 'Add Domain Name',
+        description: 'Please provide a valid domain name',
         confirm: 'Add',
         cancel: 'Cancel',
         blocklet: 'Select Blocklet',
@@ -861,7 +862,8 @@ module.exports = {
       add: {
         title: 'Add Additional Domain',
         domainDescription: 'Please provide a valid domain name',
-        forceTip: 'Force add if domain name already exists'
+        forceTip: 'Force add if domain name already exists',
+        helperText: 'If an HTTP or HTTPS URL is entered, it will be automatically converted into a domain name.'
       },
       delete: {
         title: 'Delete',

package/es/locales/zh.js

@@ -823,13 +823,14 @@ module.exports = {
       rewriteUrlRequired: '重写到 URL 是必填的'
     },
     domain: {
+      addSite: '添加站点',
       validate: {
         emptyTip: '站点域名不能为空',
         suffixTip: '站点域名不能包含 {suffix}'
       },
       add: {
-        title: '添加站点',
-        description: '请填写你所拥有的合法的站点地址',
+        title: '添加域名',
+        description: '请填写你所拥有的合法的域名',
         confirm: '添加',
         cancel: '取消',
         blocklet: '选择基石程序',
@@ -864,7 +865,8 @@ module.exports = {
       add: {
         title: '添加额外域名',
         domainDescription: '请填写有效的域名',
-        forceTip: '当域名已存在时强制添加'
+        forceTip: '当域名已存在时强制添加',
+        helperText: '如果输入 HTTP 或者 HTTPS URL, 则会被自动转换为域名。'
       },
       delete: {
         title: '删除',

package/es/subscription.js

@@ -15,6 +15,7 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 const ALERT_THRESHOLD_MS = 30 * 24 * 60 * 60 * 1000;
 function Subscription({
+  launcherUrl,
   chainHost,
   nftId,
   retention,
@@ -33,8 +34,18 @@ function Subscription({
     sx = {},
     ...rest
   } = props;
-  const assetState = useAsyncRetry(() => getAsset(chainHost, nftId));
-  if (assetState.loading) {
+  const asyncState = useAsyncRetry(async () => {
+    const [asset, subscriptionURL] = await Promise.all([getAsset(chainHost, nftId), getSubscriptionURL({
+      launcherUrl,
+      nftId,
+      locale
+    })]);
+    return {
+      asset,
+      subscriptionURL
+    };
+  }, [locale]);
+  if (asyncState.loading) {
     return /*#__PURE__*/_jsxs(Box, {
       sx: {
         display: 'flex',
@@ -49,8 +60,8 @@ function Subscription({
       }), t('expiration.loading')]
     });
   }
-  if (assetState.error) {
-    console.error(assetState.error);
+  if (asyncState.error) {
+    console.error(asyncState.error);
     return /*#__PURE__*/_jsx(Chip, {
       label: t('expiration.loadFailed'),
       color: "error",
@@ -60,11 +71,10 @@ function Subscription({
         ...sx
       },
       ...rest,
-      onClick: () => assetState.retry()
+      onClick: () => asyncState.retry()
     });
   }
-  const expirationDate = getAssetExpiration(assetState.value);
-  const launcherUrl = assetState.value?.data?.value?.launcherUrl;
+  const expirationDate = getAssetExpiration(asyncState.value?.asset);
   const isExpired = dayjs(expirationDate).isBefore(dayjs());
   const validityMs = dayjs(expirationDate).diff(dayjs(), 'ms');
   let status = 'success';
@@ -122,11 +132,7 @@ function Subscription({
         style: {
           border: 0
         },
-        src: getSubscriptionURL({
-          launcherUrl,
-          nftId,
-          locale
-        })
+        src: asyncState.value?.subscriptionURL
       })
     })]
   });
@@ -135,10 +141,13 @@ Subscription.propTypes = {
   chainHost: PropTypes.string.isRequired,
   nftId: PropTypes.string.isRequired,
   sx: PropTypes.object,
-  retention: PropTypes.number
+  retention: PropTypes.number,
+  launcherUrl: PropTypes.string
 };
 Subscription.defaultProps = {
   sx: {},
-  retention: 0
+  retention: 0,
+  launcherUrl: 'https://launcher.arcblock.io/' // 兼容: 旧版本的 blocklet.controller 没有 launcherUrl 字段
 };
+
 export default Subscription;

package/es/util/index.js

@@ -590,9 +590,27 @@ export const getRenewBlockletURL = ({
   nftId = '',
   locale = 'en'
 }) => joinUrl(launcherUrl, `/instances/${nftId}/renewal?locale=${locale}&return-url=${encodeURIComponent(window.location.href)}`);
-export const getSubscriptionURL = ({
+export const getSubscriptionURL = async ({
   launcherUrl = '',
   nftId = '',
   locale = 'en'
-}) => joinUrl(launcherUrl, `/instances/${nftId}/subscription?locale=${locale}&return-url=${encodeURIComponent(window.location.href)}`);
+}) => {
+  if (!launcherUrl) {
+    return '';
+  }
+  let baseUrl = joinUrl(launcherUrl, '/instances');
+  try {
+    const {
+      data: appMeta
+    } = await axios.get(joinUrl(launcherUrl, '__blocklet__.js?type=json'), {
+      timeout: 5000
+    });
+    const mountPoint = appMeta.componentMountPoints?.find(item => item.did === 'z8iZy4P83i6AgnNdNUexsh2kBcsDHoqcwPavn');
+    const launcherUrlObj = new URL(launcherUrl);
+    baseUrl = joinUrl(launcherUrlObj.origin, mountPoint?.mountPoint, '/nfts');
+  } catch (error) {
+    console.error(error);
+  }
+  return joinUrl(baseUrl, `/${nftId}/subscription?locale=${locale}&return-url=${encodeURIComponent(window.location.href)}`);
+};
 export const nanoid = (length = 16) => [...Array(length)].map(() => Math.random().toString(36)[2]).join('');

package/lib/blocklet/router/action/add-domain-alias.js

@@ -12,7 +12,6 @@ var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
 var _context = require("@arcblock/ux/lib/Locale/context");
-var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _confirm = _interopRequireDefault(require("../../../confirm"));
 var _util = require("../../../util");
 var _node = require("../../../contexts/node");
@@ -52,15 +51,13 @@ function AddDomainAlias(_ref) {
       await api.addDomainAlias({
         input: {
           id,
-          domainAlias: params.domain.trim(),
+          domainAlias: (0, _util2.parseDomainFromURL)(params.domain),
           teamDid
         }
       });
       await (0, _util.sleep)(2000);
-    } catch (err) {
-      _Toast.default.error(err.message);
-    } finally {
       setConfirmSetting(null);
+    } finally {
       setLoading(false);
     }
   };
@@ -80,6 +77,7 @@ function AddDomainAlias(_ref) {
       component: "div",
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_TextField.default, {
         label: t('router.domainAlias.add.domainDescription'),
+        helperText: t('router.domainAlias.add.helperText'),
         autoComplete: "off",
         variant: "outlined",
         name: "domain",

package/lib/blocklet/router/util.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.validateSite = exports.validateRule = exports.validatePathPrefix = exports.validateDomain = exports.isSpecialDomain = exports.getInitialBlockletDid = void 0;
+exports.validateSite = exports.validateRule = exports.validatePathPrefix = exports.validateDomain = exports.parseDomainFromURL = exports.isSpecialDomain = exports.getInitialBlockletDid = void 0;
 var _constant = require("@abtnode/constant");
 var _isPathPrefixEqual = _interopRequireDefault(require("@abtnode/util/lib/is-path-prefix-equal"));
 var _constant2 = require("@blocklet/constant");
@@ -143,4 +143,21 @@ const isSpecialDomain = name => {
   }
   return specialDomains.includes(name);
 };
-exports.isSpecialDomain = isSpecialDomain;
+exports.isSpecialDomain = isSpecialDomain;
+const parseDomainFromURL = tmpDomain => {
+  if (!tmpDomain || typeof tmpDomain !== 'string') {
+    return tmpDomain;
+  }
+  let domain = tmpDomain.trim();
+  try {
+    domain = domain.toLowerCase();
+    if (domain.startsWith('http://') || domain.startsWith('https://')) {
+      return new URL(domain).hostname;
+    }
+    return domain;
+  } catch (error) {
+    console.error('format domain failed', error);
+    return domain;
+  }
+};
+exports.parseDomainFromURL = parseDomainFromURL;

package/lib/locales/en.js

@@ -822,13 +822,14 @@ module.exports = {
       rewriteUrlRequired: 'Rewrite URL is required'
     },
     domain: {
+      addSite: 'Add Site',
       validate: {
         emptyTip: 'Site domain cannot be empty',
         suffixTip: 'Site domain cannot include {suffix}'
       },
       add: {
-        title: 'Add Site',
-        description: 'Please provide a valid site name address',
+        title: 'Add Domain Name',
+        description: 'Please provide a valid domain name',
         confirm: 'Add',
         cancel: 'Cancel',
         blocklet: 'Select Blocklet',
@@ -863,7 +864,8 @@ module.exports = {
       add: {
         title: 'Add Additional Domain',
         domainDescription: 'Please provide a valid domain name',
-        forceTip: 'Force add if domain name already exists'
+        forceTip: 'Force add if domain name already exists',
+        helperText: 'If an HTTP or HTTPS URL is entered, it will be automatically converted into a domain name.'
       },
       delete: {
         title: 'Delete',

package/lib/locales/zh.js

@@ -825,13 +825,14 @@ module.exports = {
       rewriteUrlRequired: '重写到 URL 是必填的'
     },
     domain: {
+      addSite: '添加站点',
       validate: {
         emptyTip: '站点域名不能为空',
         suffixTip: '站点域名不能包含 {suffix}'
       },
       add: {
-        title: '添加站点',
-        description: '请填写你所拥有的合法的站点地址',
+        title: '添加域名',
+        description: '请填写你所拥有的合法的域名',
         confirm: '添加',
         cancel: '取消',
         blocklet: '选择基石程序',
@@ -866,7 +867,8 @@ module.exports = {
       add: {
         title: '添加额外域名',
         domainDescription: '请填写有效的域名',
-        forceTip: '当域名已存在时强制添加'
+        forceTip: '当域名已存在时强制添加',
+        helperText: '如果输入 HTTP 或者 HTTPS URL, 则会被自动转换为域名。'
       },
       delete: {
         title: '删除',

package/lib/subscription.js

@@ -17,7 +17,7 @@ var _useAsyncRetry = _interopRequireDefault(require("react-use/lib/useAsyncRetry
 var _useSetState = _interopRequireDefault(require("react-use/lib/useSetState"));
 var _util = require("./util");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["chainHost", "nftId", "retention"],
+const _excluded = ["launcherUrl", "chainHost", "nftId", "retention"],
   _excluded2 = ["sx"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -29,8 +29,9 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 const ALERT_THRESHOLD_MS = 30 * 24 * 60 * 60 * 1000;
 function Subscription(_ref) {
-  var _assetState$value, _assetState$value$dat, _assetState$value$dat2;
+  var _asyncState$value, _asyncState$value2;
   let {
+      launcherUrl,
       chainHost,
       nftId,
       retention
@@ -49,8 +50,18 @@ function Subscription(_ref) {
       sx = {}
     } = props,
     rest = _objectWithoutProperties(props, _excluded2);
-  const assetState = (0, _useAsyncRetry.default)(() => (0, _util.getAsset)(chainHost, nftId));
-  if (assetState.loading) {
+  const asyncState = (0, _useAsyncRetry.default)(async () => {
+    const [asset, subscriptionURL] = await Promise.all([(0, _util.getAsset)(chainHost, nftId), (0, _util.getSubscriptionURL)({
+      launcherUrl,
+      nftId,
+      locale
+    })]);
+    return {
+      asset,
+      subscriptionURL
+    };
+  }, [locale]);
+  if (asyncState.loading) {
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, _objectSpread(_objectSpread({
       sx: _objectSpread({
         display: 'flex',
@@ -64,8 +75,8 @@ function Subscription(_ref) {
       }), t('expiration.loading')]
     }));
   }
-  if (assetState.error) {
-    console.error(assetState.error);
+  if (asyncState.error) {
+    console.error(asyncState.error);
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Chip.default, _objectSpread(_objectSpread({
       label: t('expiration.loadFailed'),
       color: "error",
@@ -74,11 +85,10 @@ function Subscription(_ref) {
         cursor: 'pointer'
       }, sx)
     }, rest), {}, {
-      onClick: () => assetState.retry()
+      onClick: () => asyncState.retry()
     }));
   }
-  const expirationDate = (0, _util.getAssetExpiration)(assetState.value);
-  const launcherUrl = (_assetState$value = assetState.value) === null || _assetState$value === void 0 ? void 0 : (_assetState$value$dat = _assetState$value.data) === null || _assetState$value$dat === void 0 ? void 0 : (_assetState$value$dat2 = _assetState$value$dat.value) === null || _assetState$value$dat2 === void 0 ? void 0 : _assetState$value$dat2.launcherUrl;
+  const expirationDate = (0, _util.getAssetExpiration)((_asyncState$value = asyncState.value) === null || _asyncState$value === void 0 ? void 0 : _asyncState$value.asset);
   const isExpired = (0, _dayjs.default)(expirationDate).isBefore((0, _dayjs.default)());
   const validityMs = (0, _dayjs.default)(expirationDate).diff((0, _dayjs.default)(), 'ms');
   let status = 'success';
@@ -135,11 +145,7 @@ function Subscription(_ref) {
         style: {
           border: 0
         },
-        src: (0, _util.getSubscriptionURL)({
-          launcherUrl,
-          nftId,
-          locale
-        })
+        src: (_asyncState$value2 = asyncState.value) === null || _asyncState$value2 === void 0 ? void 0 : _asyncState$value2.subscriptionURL
       })
     })]
   });
@@ -148,11 +154,13 @@ Subscription.propTypes = {
   chainHost: _propTypes.default.string.isRequired,
   nftId: _propTypes.default.string.isRequired,
   sx: _propTypes.default.object,
-  retention: _propTypes.default.number
+  retention: _propTypes.default.number,
+  launcherUrl: _propTypes.default.string
 };
 Subscription.defaultProps = {
   sx: {},
-  retention: 0
+  retention: 0,
+  launcherUrl: 'https://launcher.arcblock.io/' // 兼容: 旧版本的 blocklet.controller 没有 launcherUrl 字段
 };
 var _default = Subscription;
 exports.default = _default;

package/lib/util/index.js

@@ -695,13 +695,30 @@ const getRenewBlockletURL = _ref7 => {
   return (0, _urlJoin.default)(launcherUrl, "/instances/".concat(nftId, "/renewal?locale=").concat(locale, "&return-url=").concat(encodeURIComponent(window.location.href)));
 };
 exports.getRenewBlockletURL = getRenewBlockletURL;
-const getSubscriptionURL = _ref8 => {
+const getSubscriptionURL = async _ref8 => {
   let {
     launcherUrl = '',
     nftId = '',
     locale = 'en'
   } = _ref8;
-  return (0, _urlJoin.default)(launcherUrl, "/instances/".concat(nftId, "/subscription?locale=").concat(locale, "&return-url=").concat(encodeURIComponent(window.location.href)));
+  if (!launcherUrl) {
+    return '';
+  }
+  let baseUrl = (0, _urlJoin.default)(launcherUrl, '/instances');
+  try {
+    var _appMeta$componentMou;
+    const {
+      data: appMeta
+    } = await _axios.default.get((0, _urlJoin.default)(launcherUrl, '__blocklet__.js?type=json'), {
+      timeout: 5000
+    });
+    const mountPoint = (_appMeta$componentMou = appMeta.componentMountPoints) === null || _appMeta$componentMou === void 0 ? void 0 : _appMeta$componentMou.find(item => item.did === 'z8iZy4P83i6AgnNdNUexsh2kBcsDHoqcwPavn');
+    const launcherUrlObj = new URL(launcherUrl);
+    baseUrl = (0, _urlJoin.default)(launcherUrlObj.origin, mountPoint === null || mountPoint === void 0 ? void 0 : mountPoint.mountPoint, '/nfts');
+  } catch (error) {
+    console.error(error);
+  }
+  return (0, _urlJoin.default)(baseUrl, "/".concat(nftId, "/subscription?locale=").concat(locale, "&return-url=").concat(encodeURIComponent(window.location.href)));
 };
 exports.getSubscriptionURL = getSubscriptionURL;
 const nanoid = function nanoid() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.15-beta-e3a24907",
+  "version": "1.16.15-beta-18951729",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -27,9 +27,9 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.15-beta-e3a24907",
-    "@abtnode/constant": "1.16.15-beta-e3a24907",
-    "@abtnode/util": "1.16.15-beta-e3a24907",
+    "@abtnode/auth": "1.16.15-beta-18951729",
+    "@abtnode/constant": "1.16.15-beta-18951729",
+    "@abtnode/util": "1.16.15-beta-18951729",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.89",
     "@arcblock/did-connect": "^2.7.6",
@@ -39,10 +39,10 @@
     "@arcblock/react-hooks": "^2.7.6",
     "@arcblock/terminal": "^2.7.6",
     "@arcblock/ux": "^2.7.6",
-    "@blocklet/constant": "1.16.15-beta-e3a24907",
+    "@blocklet/constant": "1.16.15-beta-18951729",
     "@blocklet/launcher-layout": "2.1.93",
     "@blocklet/list": "^0.12.27",
-    "@blocklet/meta": "1.16.15-beta-e3a24907",
+    "@blocklet/meta": "1.16.15-beta-18951729",
     "@blocklet/ui-react": "^2.7.6",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -98,7 +98,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "b87c810902571b8cdb8f12ef497286b1549888e9",
+  "gitHead": "6ba076bcc138a3b9948771deae0f723a5104f70f",
   "exports": {
     ".": {
       "import": "./es/index.js",