@abtnode/ux 1.16.22-beta-f47f2cf7 → 1.16.22-beta-5bf86cd3

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

@@ -1,5 +1,6 @@
 import Connect from '@arcblock/did-connect/lib/Connect';
 import Button from '@arcblock/ux/lib/Button';
+import Center from '@arcblock/ux/lib/Center';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Toast from '@arcblock/ux/lib/Toast';
 import IconInfo from '@mui/icons-material/InfoOutlined';
@@ -12,6 +13,8 @@ import noop from 'lodash/noop';
 import trim from 'lodash/trim';
 import PropTypes from 'prop-types';
 import useSetState from 'react-use/lib/useSetState';
+import useAsync from 'react-use/lib/useAsync';
+import { CircularProgress } from '@mui/material';
 import joinURL from 'url-join';
 import { useDomainContext } from '../../contexts/domain';
 import { useNodeContext } from '../../contexts/node';
@@ -22,6 +25,22 @@ import { parseDomainFromURL } 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";
+const DID_DOMAIN_SERVICE_DID = 'z2qaGosS3rZ7m5ttP3Nd4V4qczR9TryTcRV4p';
+const didDomainServiceMountPoint = async url => {
+  if (!url || !url?.trim()) {
+    return '';
+  }
+  const urlObj = new URL(url);
+  urlObj.pathname = '__blocklet__.js';
+  urlObj.searchParams.set('type', 'json');
+  const {
+    data
+  } = await axios.get(urlObj.toString());
+  const component = data?.componentMountPoints?.find(x => x.did === DID_DOMAIN_SERVICE_DID);
+  const resultUrlObj = new URL(url);
+  resultUrlObj.pathname = joinURL(component?.mountPoint || '', '/api');
+  return resultUrlObj.toString();
+};
 export default function AddDomain({
   siteId,
   teamDid,
@@ -53,9 +72,24 @@ export default function AddDomain({
     showNFTDomainAuth: false,
     showDnsTip: false
   });
-  let nftDomainURL = '';
-  if (info.nftDomainUrl) {
-    nftDomainURL = joinURL(info.nftDomainUrl, '/api');
+  const nftDomainURLState = useAsync(() => didDomainServiceMountPoint(info?.nftDomainUrl));
+  if (info?.nftDomainUrl && nftDomainURLState.loading) {
+    return /*#__PURE__*/_jsx(Box, {
+      ...props,
+      children: /*#__PURE__*/_jsx(Center, {
+        relative: "parent",
+        children: /*#__PURE__*/_jsx(CircularProgress, {})
+      })
+    });
+  }
+  if (nftDomainURLState.error) {
+    return /*#__PURE__*/_jsx(Box, {
+      ...props,
+      children: /*#__PURE__*/_jsx(Center, {
+        relative: "parent",
+        children: nftDomainURLState.error.message
+      })
+    });
   }
   const handleAuthSuccess = async ({
     domain,
@@ -97,6 +131,7 @@ export default function AddDomain({
   };
   const error = domainContext.error || state.error; // TODO: state error 可能不需要了
 
+  const nftDomainURL = nftDomainURLState.value;
   const domainTypes = {
     inputDomain: {
       name: t('router.domainAlias.inputDomain'),

package/es/locales/index.js

@@ -1,35 +1,20 @@
 /* eslint-disable import/prefer-default-export */
 import flat from 'flat';
 import en from './en';
-import zh from './zh';
-import ar from './ar';
-import de from './de';
-import es from './es';
-import fr from './fr';
-import hi from './hi';
-import id from './id';
-import ja from './ja';
-import ko from './ko';
-import pt from './pt';
-import ru from './ru';
-import th from './th';
-import vi from './vi';
-// eslint-disable-next-line import/no-unresolved
-import zhTw from './zh-tw';
 export const translations = {
-  ar: flat(ar),
-  de: flat(de),
   en: flat(en),
-  es: flat(es),
-  fr: flat(fr),
-  hi: flat(hi),
-  id: flat(id),
-  ja: flat(ja),
-  ko: flat(ko),
-  pt: flat(pt),
-  ru: flat(ru),
-  th: flat(th),
-  vi: flat(vi),
-  'zh-TW': flat(zhTw),
-  zh: flat(zh)
+  ar: () => import('./ar').then(m => flat(m.default)),
+  de: () => import('./de').then(m => flat(m.default)),
+  es: () => import('./es').then(m => flat(m.default)),
+  fr: () => import('./fr').then(m => flat(m.default)),
+  hi: () => import('./hi').then(m => flat(m.default)),
+  id: () => import('./id').then(m => flat(m.default)),
+  ja: () => import('./ja').then(m => flat(m.default)),
+  ko: () => import('./ko').then(m => flat(m.default)),
+  pt: () => import('./pt').then(m => flat(m.default)),
+  ru: () => import('./ru').then(m => flat(m.default)),
+  th: () => import('./th').then(m => flat(m.default)),
+  vi: () => import('./vi').then(m => flat(m.default)),
+  'zh-TW': () => import('./zh-tw').then(m => flat(m.default)),
+  zh: () => import('./zh').then(m => flat(m.default))
 };

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = AddDomain;
 var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
+var _Center = _interopRequireDefault(require("@arcblock/ux/lib/Center"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _InfoOutlined = _interopRequireDefault(require("@mui/icons-material/InfoOutlined"));
@@ -18,6 +19,8 @@ var _noop = _interopRequireDefault(require("lodash/noop"));
 var _trim = _interopRequireDefault(require("lodash/trim"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _useSetState = _interopRequireDefault(require("react-use/lib/useSetState"));
+var _useAsync = _interopRequireDefault(require("react-use/lib/useAsync"));
+var _material = require("@mui/material");
 var _urlJoin = _interopRequireDefault(require("url-join"));
 var _domain = require("../../contexts/domain");
 var _node = require("../../contexts/node");
@@ -35,6 +38,23 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 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 DID_DOMAIN_SERVICE_DID = 'z2qaGosS3rZ7m5ttP3Nd4V4qczR9TryTcRV4p';
+const didDomainServiceMountPoint = async url => {
+  var _data$componentMountP;
+  if (!url || !(url !== null && url !== void 0 && url.trim())) {
+    return '';
+  }
+  const urlObj = new URL(url);
+  urlObj.pathname = '__blocklet__.js';
+  urlObj.searchParams.set('type', 'json');
+  const {
+    data
+  } = await _api.axios.get(urlObj.toString());
+  const component = data === null || data === void 0 ? void 0 : (_data$componentMountP = data.componentMountPoints) === null || _data$componentMountP === void 0 ? void 0 : _data$componentMountP.find(x => x.did === DID_DOMAIN_SERVICE_DID);
+  const resultUrlObj = new URL(url);
+  resultUrlObj.pathname = (0, _urlJoin.default)((component === null || component === void 0 ? void 0 : component.mountPoint) || '', '/api');
+  return resultUrlObj.toString();
+};
 function AddDomain(_ref) {
   let {
       siteId,
@@ -67,9 +87,22 @@ function AddDomain(_ref) {
     showNFTDomainAuth: false,
     showDnsTip: false
   });
-  let nftDomainURL = '';
-  if (info.nftDomainUrl) {
-    nftDomainURL = (0, _urlJoin.default)(info.nftDomainUrl, '/api');
+  const nftDomainURLState = (0, _useAsync.default)(() => didDomainServiceMountPoint(info === null || info === void 0 ? void 0 : info.nftDomainUrl));
+  if (info !== null && info !== void 0 && info.nftDomainUrl && nftDomainURLState.loading) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, _objectSpread(_objectSpread({}, props), {}, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Center.default, {
+        relative: "parent",
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.CircularProgress, {})
+      })
+    }));
+  }
+  if (nftDomainURLState.error) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, _objectSpread(_objectSpread({}, props), {}, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Center.default, {
+        relative: "parent",
+        children: nftDomainURLState.error.message
+      })
+    }));
   }
   const handleAuthSuccess = async _ref2 => {
     let {
@@ -112,6 +145,7 @@ function AddDomain(_ref) {
   };
   const error = domainContext.error || state.error; // TODO: state error 可能不需要了
 
+  const nftDomainURL = nftDomainURLState.value;
   const domainTypes = {
     inputDomain: {
       name: t('router.domainAlias.inputDomain'),

package/lib/locales/index.js

@@ -6,39 +6,23 @@ Object.defineProperty(exports, "__esModule", {
 exports.translations = void 0;
 var _flat = _interopRequireDefault(require("flat"));
 var _en = _interopRequireDefault(require("./en"));
-var _zh = _interopRequireDefault(require("./zh"));
-var _ar = _interopRequireDefault(require("./ar"));
-var _de = _interopRequireDefault(require("./de"));
-var _es = _interopRequireDefault(require("./es"));
-var _fr = _interopRequireDefault(require("./fr"));
-var _hi = _interopRequireDefault(require("./hi"));
-var _id = _interopRequireDefault(require("./id"));
-var _ja = _interopRequireDefault(require("./ja"));
-var _ko = _interopRequireDefault(require("./ko"));
-var _pt = _interopRequireDefault(require("./pt"));
-var _ru = _interopRequireDefault(require("./ru"));
-var _th = _interopRequireDefault(require("./th"));
-var _vi = _interopRequireDefault(require("./vi"));
-var _zhTw = _interopRequireDefault(require("./zh-tw"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/* eslint-disable import/prefer-default-export */
-
-// eslint-disable-next-line import/no-unresolved
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; } /* eslint-disable import/prefer-default-export */
 const translations = exports.translations = {
-  ar: (0, _flat.default)(_ar.default),
-  de: (0, _flat.default)(_de.default),
   en: (0, _flat.default)(_en.default),
-  es: (0, _flat.default)(_es.default),
-  fr: (0, _flat.default)(_fr.default),
-  hi: (0, _flat.default)(_hi.default),
-  id: (0, _flat.default)(_id.default),
-  ja: (0, _flat.default)(_ja.default),
-  ko: (0, _flat.default)(_ko.default),
-  pt: (0, _flat.default)(_pt.default),
-  ru: (0, _flat.default)(_ru.default),
-  th: (0, _flat.default)(_th.default),
-  vi: (0, _flat.default)(_vi.default),
-  'zh-TW': (0, _flat.default)(_zhTw.default),
-  zh: (0, _flat.default)(_zh.default)
+  ar: () => Promise.resolve().then(() => _interopRequireWildcard(require('./ar'))).then(m => (0, _flat.default)(m.default)),
+  de: () => Promise.resolve().then(() => _interopRequireWildcard(require('./de'))).then(m => (0, _flat.default)(m.default)),
+  es: () => Promise.resolve().then(() => _interopRequireWildcard(require('./es'))).then(m => (0, _flat.default)(m.default)),
+  fr: () => Promise.resolve().then(() => _interopRequireWildcard(require('./fr'))).then(m => (0, _flat.default)(m.default)),
+  hi: () => Promise.resolve().then(() => _interopRequireWildcard(require('./hi'))).then(m => (0, _flat.default)(m.default)),
+  id: () => Promise.resolve().then(() => _interopRequireWildcard(require('./id'))).then(m => (0, _flat.default)(m.default)),
+  ja: () => Promise.resolve().then(() => _interopRequireWildcard(require('./ja'))).then(m => (0, _flat.default)(m.default)),
+  ko: () => Promise.resolve().then(() => _interopRequireWildcard(require('./ko'))).then(m => (0, _flat.default)(m.default)),
+  pt: () => Promise.resolve().then(() => _interopRequireWildcard(require('./pt'))).then(m => (0, _flat.default)(m.default)),
+  ru: () => Promise.resolve().then(() => _interopRequireWildcard(require('./ru'))).then(m => (0, _flat.default)(m.default)),
+  th: () => Promise.resolve().then(() => _interopRequireWildcard(require('./th'))).then(m => (0, _flat.default)(m.default)),
+  vi: () => Promise.resolve().then(() => _interopRequireWildcard(require('./vi'))).then(m => (0, _flat.default)(m.default)),
+  'zh-TW': () => Promise.resolve().then(() => _interopRequireWildcard(require('./zh-tw'))).then(m => (0, _flat.default)(m.default)),
+  zh: () => Promise.resolve().then(() => _interopRequireWildcard(require('./zh'))).then(m => (0, _flat.default)(m.default))
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.22-beta-f47f2cf7",
+  "version": "1.16.22-beta-5bf86cd3",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -27,24 +27,24 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.22-beta-f47f2cf7",
-    "@abtnode/constant": "1.16.22-beta-f47f2cf7",
-    "@abtnode/util": "1.16.22-beta-f47f2cf7",
+    "@abtnode/auth": "1.16.22-beta-5bf86cd3",
+    "@abtnode/constant": "1.16.22-beta-5bf86cd3",
+    "@abtnode/util": "1.16.22-beta-5bf86cd3",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.108",
-    "@arcblock/did-connect": "^2.9.5",
+    "@arcblock/did-connect": "^2.9.13",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.9.5",
-    "@arcblock/nft-display": "2.9.5",
-    "@arcblock/react-hooks": "^2.9.5",
-    "@arcblock/terminal": "^2.9.5",
-    "@arcblock/ux": "^2.9.5",
-    "@blocklet/constant": "1.16.22-beta-f47f2cf7",
-    "@blocklet/launcher-layout": "2.2.50",
-    "@blocklet/list": "^0.12.62",
-    "@blocklet/meta": "1.16.22-beta-f47f2cf7",
-    "@blocklet/ui-react": "^2.9.3",
-    "@blocklet/uploader": "^0.0.62",
+    "@arcblock/icons": "^2.9.13",
+    "@arcblock/nft-display": "2.9.13",
+    "@arcblock/react-hooks": "^2.9.13",
+    "@arcblock/terminal": "^2.9.13",
+    "@arcblock/ux": "^2.9.13",
+    "@blocklet/constant": "1.16.22-beta-5bf86cd3",
+    "@blocklet/launcher-layout": "2.2.51",
+    "@blocklet/list": "^0.12.65",
+    "@blocklet/meta": "1.16.22-beta-5bf86cd3",
+    "@blocklet/ui-react": "^2.9.13",
+    "@blocklet/uploader": "^0.0.64",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -102,7 +102,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "428b62fcd74f971338b0852c0fce6ce367b0da90",
+  "gitHead": "5cac513901c247011be421fb8428d7875f475b0f",
   "exports": {
     ".": {
       "import": "./es/index.js",