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

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

@@ -1,3 +1,4 @@
+import { getDidDomainServiceURL } from '@abtnode/util/lib/did-domain';
 import Connect from '@arcblock/did-connect/lib/Connect';
 import Button from '@arcblock/ux/lib/Button';
 import Center from '@arcblock/ux/lib/Center';
@@ -15,7 +16,6 @@ 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';
 import { sleep, validateDomain } from '../../util';
@@ -25,22 +25,6 @@ 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,
@@ -72,7 +56,7 @@ export default function AddDomain({
     showNFTDomainAuth: false,
     showDnsTip: false
   });
-  const nftDomainURLState = useAsync(() => didDomainServiceMountPoint(info?.nftDomainUrl));
+  const nftDomainURLState = useAsync(() => getDidDomainServiceURL(info?.nftDomainUrl));
   if (info?.nftDomainUrl && nftDomainURLState.loading) {
     return /*#__PURE__*/_jsx(Box, {
       ...props,
@@ -131,7 +115,7 @@ export default function AddDomain({
   };
   const error = domainContext.error || state.error; // TODO: state error 可能不需要了
 
-  const nftDomainURL = nftDomainURLState.value;
+  const nftDomainService = nftDomainURLState.value;
   const domainTypes = {
     inputDomain: {
       name: t('router.domainAlias.inputDomain'),
@@ -199,7 +183,7 @@ export default function AddDomain({
       })
     }
   };
-  if (info?.nftDomainUrl) {
+  if (info?.nftDomainUrl && nftDomainService) {
     domainTypes.nftDomain = {
       name: t('router.domainAlias.nftDomain'),
       component: /*#__PURE__*/_jsxs(_Fragment, {
@@ -213,7 +197,7 @@ export default function AddDomain({
             children: t('router.domainAlias.addDomainNFT.tips')
           }), /*#__PURE__*/_jsxs("div", {
             children: [t('router.domainAlias.addDomainNFT.buyTip'), /*#__PURE__*/_jsxs(Link, {
-              href: info.nftDomainUrl,
+              href: nftDomainService.base,
               sx: {
                 fontSize: '14px',
                 display: 'inline-flex',
@@ -242,9 +226,9 @@ export default function AddDomain({
           popup: true,
           useSocket: false,
           action: "authorize",
-          baseUrl: nftDomainURL,
+          baseUrl: nftDomainService.api,
           checkFn: axios.create({
-            baseURL: nftDomainURL
+            baseURL: nftDomainService.api
           }).get,
           extraParams: {
             delegatee: appId,

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = AddDomain;
+var _didDomain = require("@abtnode/util/lib/did-domain");
 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"));
@@ -21,7 +22,6 @@ 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");
 var _util = require("../../util");
@@ -38,23 +38,6 @@ 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,
@@ -87,7 +70,7 @@ function AddDomain(_ref) {
     showNFTDomainAuth: false,
     showDnsTip: false
   });
-  const nftDomainURLState = (0, _useAsync.default)(() => didDomainServiceMountPoint(info === null || info === void 0 ? void 0 : info.nftDomainUrl));
+  const nftDomainURLState = (0, _useAsync.default)(() => (0, _didDomain.getDidDomainServiceURL)(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, {
@@ -145,7 +128,7 @@ function AddDomain(_ref) {
   };
   const error = domainContext.error || state.error; // TODO: state error 可能不需要了
 
-  const nftDomainURL = nftDomainURLState.value;
+  const nftDomainService = nftDomainURLState.value;
   const domainTypes = {
     inputDomain: {
       name: t('router.domainAlias.inputDomain'),
@@ -214,7 +197,7 @@ function AddDomain(_ref) {
       })
     }
   };
-  if (info !== null && info !== void 0 && info.nftDomainUrl) {
+  if (info !== null && info !== void 0 && info.nftDomainUrl && nftDomainService) {
     domainTypes.nftDomain = {
       name: t('router.domainAlias.nftDomain'),
       component: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
@@ -228,7 +211,7 @@ function AddDomain(_ref) {
             children: t('router.domainAlias.addDomainNFT.tips')
           }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             children: [t('router.domainAlias.addDomainNFT.buyTip'), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Link.default, {
-              href: info.nftDomainUrl,
+              href: nftDomainService.base,
               sx: {
                 fontSize: '14px',
                 display: 'inline-flex',
@@ -257,9 +240,9 @@ function AddDomain(_ref) {
           popup: true,
           useSocket: false,
           action: "authorize",
-          baseUrl: nftDomainURL,
+          baseUrl: nftDomainService.api,
           checkFn: _api.axios.create({
-            baseURL: nftDomainURL
+            baseURL: nftDomainService.api
           }).get,
           extraParams: {
             delegatee: appId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.22-beta-5bf86cd3",
+  "version": "1.16.22-beta-cab2dffe",
   "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.22-beta-5bf86cd3",
-    "@abtnode/constant": "1.16.22-beta-5bf86cd3",
-    "@abtnode/util": "1.16.22-beta-5bf86cd3",
+    "@abtnode/auth": "1.16.22-beta-cab2dffe",
+    "@abtnode/constant": "1.16.22-beta-cab2dffe",
+    "@abtnode/util": "1.16.22-beta-cab2dffe",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.108",
     "@arcblock/did-connect": "^2.9.13",
@@ -39,10 +39,10 @@
     "@arcblock/react-hooks": "^2.9.13",
     "@arcblock/terminal": "^2.9.13",
     "@arcblock/ux": "^2.9.13",
-    "@blocklet/constant": "1.16.22-beta-5bf86cd3",
+    "@blocklet/constant": "1.16.22-beta-cab2dffe",
     "@blocklet/launcher-layout": "2.2.51",
     "@blocklet/list": "^0.12.65",
-    "@blocklet/meta": "1.16.22-beta-5bf86cd3",
+    "@blocklet/meta": "1.16.22-beta-cab2dffe",
     "@blocklet/ui-react": "^2.9.13",
     "@blocklet/uploader": "^0.0.64",
     "@emotion/react": "^11.10.4",
@@ -102,7 +102,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "5cac513901c247011be421fb8428d7875f475b0f",
+  "gitHead": "97a0558921704362758f3798a0d0716dfbfeaee9",
   "exports": {
     ".": {
       "import": "./es/index.js",