@abtnode/ux 1.16.21-beta-2e75c75c → 1.16.21-beta-da3f852a

package/es/locales/zh.js

@@ -1,3 +1,4 @@
+/* eslint-disable prettier/prettier */
 export default {
   setup: {
     connect: {
@@ -64,7 +65,8 @@ export default {
       scan: '连接 DID 钱包出示 NFT 以换取通行证',
       confirm: '在钱包中选择 NFT',
       success: '通行证换取成功'
-    }
+    },
+    login: '登录'
   },
   payablePassport: {
     title: 'Purchase passport with payment',
@@ -376,7 +378,8 @@ export default {
       upgradeDescription: '升级基石程序可能会导致其短暂不可用，是否要继续？',
       confirmUpgrade: '是的，升级吧',
       confirmRestart: '是的，重启吧',
-      restartDescription: '服务会短暂暂停，并且有可能因为变更了配置无法启动'
+      restartDescription: '服务会短暂暂停，并且有可能因为变更了配置无法启动',
+      confirmComponentRemove: '是的，刪除它'
     },
     dev: {
       modeTip: '请将节点切换至 DEBUG 模式'
@@ -807,7 +810,11 @@ export default {
       monitor: {
         diskThreshold: '当磁盘使用率超过（%）时发送报警',
         diskThresholdPlaceholder: '请设置磁盘使用率报警阈值'
-      }
+      },
+      domainRequired: '服务器域名是必需的',
+      ipPlaceholder: 'IP',
+      ipRequired: 'IP是必需的',
+      enableWelcomePage: '启用欢迎页'
     },
     accessKey: {
       accessKeyId: 'Access Key',
@@ -1069,7 +1076,8 @@ export default {
         sourceTypes: {
           upload: '通过上传文件',
           lets_encrypt: "通过 Let's Encrypt 自动生成"
-        }
+        },
+        source: '來源'
       },
       detail: {
         title: '证书详情'
@@ -1415,7 +1423,8 @@ export default {
     dialog: {
       confirm: '在您的 DID 钱包上确认',
       success: '通行证已成功添加到您的 DID 钱包',
-      loginWithPassport: '用此通行证连接'
+      loginWithPassport: '用此通行证连接',
+      scan: '使用您的DID钱包来申领护照'
     }
   },
   lostPassport: {
@@ -1566,7 +1575,8 @@ export default {
         switch: {
           failedForMismatchSpace: '请连接至正确的 Space{name}'
         },
-        connectTo: '连接至 DID Spaces'
+        connectTo: '连接至 DID Spaces',
+        title: '门户'
       },
       strategy: {
         title: '备份策略',

package/es/util/index.js

@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 /* eslint-disable implicit-arrow-linebreak */
 /* eslint-disable import/prefer-default-export */
-import { BLOCKLET_STORE_API_PREFIX, DEFAULT_DID_DOMAIN, DEFAULT_IP_DOMAIN_SUFFIX, DEFAULT_SLP_DOMAIN, DOMAIN_FOR_DEFAULT_SITE, DOMAIN_FOR_INTERNAL_SITE, DOMAIN_FOR_IP_SITE, DOMAIN_FOR_IP_SITE_REGEXP, IP, ROLES, SLOT_FOR_IP_DNS_SITE, WEB_WALLET_URL, WELLKNOWN_PATH_PREFIX, WELLKNOWN_PING_PREFIX, WELLKNOWN_SERVICE_PATH_PREFIX } from '@abtnode/constant';
+import { BLOCKLET_STORE_API_PREFIX, DEFAULT_DID_DOMAIN, DEFAULT_IP_DOMAIN_SUFFIX, DEFAULT_SLP_DOMAIN, DOMAIN_FOR_DEFAULT_SITE, DOMAIN_FOR_INTERNAL_SITE, DOMAIN_FOR_IP_SITE, DOMAIN_FOR_IP_SITE_REGEXP, IP, ROLES, SLOT_FOR_IP_DNS_SITE, WEB_WALLET_URL, WELLKNOWN_PATH_PREFIX, WELLKNOWN_PING_PREFIX, WELLKNOWN_SERVICE_PATH_PREFIX, WELLKNOWN_BLOCKLET_HEALTH_PATH } from '@abtnode/constant';
 import filesize from 'filesize';
 import humanizeUrl from 'humanize-url';
 import isUrl from 'is-url';
@@ -12,6 +12,7 @@ import qs from 'querystring';
 import joinUrl from 'url-join';
 import axios from '@abtnode/util/lib/axios';
 import dayjs from '@abtnode/util/lib/dayjs';
+import tryWithTimeout from '@abtnode/util/lib/try-with-timeout';
 import formatError from '@abtnode/util/lib/format-error';
 import normalizePathPrefix from '@abtnode/util/lib/normalize-path-prefix';
 import { evaluateURLs } from '@abtnode/util/lib/url-evaluation';
@@ -375,12 +376,49 @@ export const getBlockletLogoUrl = ({
 };
 export const getPathPrefix = () => window.env && window.env.apiPrefix ? window.env.apiPrefix : '/';
 export const isUrlAccessible = url => checkAccessible(joinUrl(new URL(url).origin, WELLKNOWN_PING_PREFIX));
+const checkBlockletAccessible = async (url, timeout = 5000) => {
+  try {
+    const urlObj = new URL(url);
+    urlObj.protocol = 'https';
+    urlObj.pathname = joinUrl(WELLKNOWN_BLOCKLET_HEALTH_PATH);
+    const response = await axios.get(urlObj.toString(), {
+      timeout,
+      validateStatus: status => {
+        return status >= 200 && status < 400 || status === 503; // 503 是 not running, 可以访问 blocklet service
+      }
+    });
+    return !!response?.data?.message;
+  } catch (error) {
+    console.error(error);
+    return false;
+  }
+};
+const waitingForAccessible = async (urls, timeout = 30 * 1000) => {
+  const tasks = await urls.map(async url => {
+    try {
+      await tryWithTimeout(async () => {
+        let accessible = false;
+        do {
+          /* eslint-disable no-await-in-loop */
+          accessible = await checkBlockletAccessible(url);
+          await sleep(2000);
+        } while (!accessible);
+      }, timeout);
+    } catch (error) {
+      console.error(error);
+    }
+  });
+  await Promise.all(tasks);
+};
 export const getAccessibleUrl = async urls => {
   try {
-    const res = await evaluateURLs(urls);
+    await waitingForAccessible(urls);
+    const res = await evaluateURLs(urls, {
+      checkAccessible: checkBlockletAccessible
+    });
     return res[0].url;
   } catch (error) {
-    console.warn('get accessible url failed');
+    console.warn('get accessible url failed', error);
     return '';
   }
 };

package/lib/exchange-passport.js

@@ -5,24 +5,24 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _reactRouterDom = require("react-router-dom");
+var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Center = _interopRequireDefault(require("@arcblock/ux/lib/Center"));
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
 var _context = require("@arcblock/ux/lib/Locale/context");
+var _fullpage = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect/fullpage"));
 var _constant = require("@abtnode/constant");
 var _wrapLocale = _interopRequireDefault(require("./wrap-locale"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _templateObject;
-/* eslint-disable react/prop-types */
-/* eslint-disable react/jsx-one-expression-per-line */
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+/* eslint-disable react/prop-types */
+
 function ExchangePassport(_ref) {
+  var _window, _window$blocklet, _window2, _window2$env;
   let {
     SessionContext,
     webWalletUrl,
@@ -73,9 +73,14 @@ function ExchangePassport(_ref) {
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {})
     });
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(Div, {
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "connect-wrapper",
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_fullpage.default, {
+    did: ((_window = window) === null || _window === void 0 ? void 0 : (_window$blocklet = _window.blocklet) === null || _window$blocklet === void 0 ? void 0 : _window$blocklet.appPid) || ((_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$env = _window2.env) === null || _window2$env === void 0 ? void 0 : _window2$env.appPid),
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+      sx: {
+        width: '560px',
+        maxWidth: '100%',
+        height: '100%'
+      },
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Connect.default, {
         className: "connect",
         action: "exchange-passport",
@@ -97,5 +102,4 @@ function ExchangePassport(_ref) {
     })
   });
 }
-var _default = exports.default = (0, _wrapLocale.default)(ExchangePassport);
-const Div = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  box-sizing: border-box;\n  width: 100%;\n  height: 100vh;\n  position: relative;\n  display: flex;\n  flex-direction: column;\n  .connect-wrapper {\n    flex: 1;\n  }\n  .connect {\n    background: #fafafa;\n  }\n"])));
+var _default = exports.default = (0, _wrapLocale.default)(ExchangePassport);

package/lib/layout/addon.js

@@ -100,4 +100,4 @@ HeaderAddon.defaultProps = {
   showHelper: true,
   sessionManagerProps: {}
 };
-const Div = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: center;\n  align-items: center;\n\n  .MuiIconButton-root svg {\n    width: 26px;\n    height: 26px;\n  }\n\n  .user-addon {\n    .user-avatar {\n      width: 28px;\n      border-radius: 14px;\n      height: auto;\n    }\n  }\n\n  ", " {\n    > button,\n    > a {\n      padding-left: 8px;\n      padding-right: 8px;\n    }\n  }\n"])), props => props.theme.breakpoints.down('md'));
+const Div = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: center;\n  align-items: center;\n\n  .MuiIconButton-root svg {\n    width: 26px;\n    height: 26px;\n  }\n\n  .user-addon {\n    .user-avatar {\n      width: 28px;\n      border-radius: 14px;\n      height: auto;\n    }\n  }\n\n  .locale-addon .locales {\n    max-height: 400px;\n    overflow-y: auto;\n  }\n\n  ", " {\n    > button,\n    > a {\n      padding-left: 8px;\n      padding-right: 8px;\n    }\n  }\n"])), props => props.theme.breakpoints.down('md'));