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

package/lib/locales/zh.js

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

package/lib/util/index.js

@@ -52,6 +52,7 @@ var _querystring = _interopRequireDefault(require("querystring"));
 var _urlJoin = _interopRequireDefault(require("url-join"));
 var _axios = _interopRequireDefault(require("@abtnode/util/lib/axios"));
 var _dayjs = _interopRequireDefault(require("@abtnode/util/lib/dayjs"));
+var _tryWithTimeout = _interopRequireDefault(require("@abtnode/util/lib/try-with-timeout"));
 var _formatError = _interopRequireDefault(require("@abtnode/util/lib/format-error"));
 var _normalizePathPrefix = _interopRequireDefault(require("@abtnode/util/lib/normalize-path-prefix"));
 var _urlEvaluation = require("@abtnode/util/lib/url-evaluation");
@@ -465,12 +466,52 @@ const getPathPrefix = () => window.env && window.env.apiPrefix ? window.env.apiP
 exports.getPathPrefix = getPathPrefix;
 const isUrlAccessible = url => (0, _checkAccessibleBrowser.default)((0, _urlJoin.default)(new URL(url).origin, _constant.WELLKNOWN_PING_PREFIX));
 exports.isUrlAccessible = isUrlAccessible;
+const checkBlockletAccessible = async function checkBlockletAccessible(url) {
+  let timeout = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 5000;
+  try {
+    var _response$data;
+    const urlObj = new URL(url);
+    urlObj.protocol = 'https';
+    urlObj.pathname = (0, _urlJoin.default)(_constant.WELLKNOWN_BLOCKLET_HEALTH_PATH);
+    const response = await _axios.default.get(urlObj.toString(), {
+      timeout,
+      validateStatus: status => {
+        return status >= 200 && status < 400 || status === 503; // 503 是 not running, 可以访问 blocklet service
+      }
+    });
+    return !!(response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && _response$data.message);
+  } catch (error) {
+    console.error(error);
+    return false;
+  }
+};
+const waitingForAccessible = async function waitingForAccessible(urls) {
+  let timeout = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 30 * 1000;
+  const tasks = await urls.map(async url => {
+    try {
+      await (0, _tryWithTimeout.default)(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);
+};
 const getAccessibleUrl = async urls => {
   try {
-    const res = await (0, _urlEvaluation.evaluateURLs)(urls);
+    await waitingForAccessible(urls);
+    const res = await (0, _urlEvaluation.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.21-beta-2e75c75c",
+  "version": "1.16.21-beta-da3f852a",
   "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.21-beta-2e75c75c",
-    "@abtnode/constant": "1.16.21-beta-2e75c75c",
-    "@abtnode/util": "1.16.21-beta-2e75c75c",
+    "@abtnode/auth": "1.16.21-beta-da3f852a",
+    "@abtnode/constant": "1.16.21-beta-da3f852a",
+    "@abtnode/util": "1.16.21-beta-da3f852a",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.108",
-    "@arcblock/did-connect": "^2.9.1",
+    "@arcblock/did-connect": "^2.9.2",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.9.1",
-    "@arcblock/nft-display": "2.9.1",
-    "@arcblock/react-hooks": "^2.9.1",
-    "@arcblock/terminal": "^2.9.1",
-    "@arcblock/ux": "^2.9.1",
-    "@blocklet/constant": "1.16.21-beta-2e75c75c",
+    "@arcblock/icons": "^2.9.2",
+    "@arcblock/nft-display": "2.9.2",
+    "@arcblock/react-hooks": "^2.9.2",
+    "@arcblock/terminal": "^2.9.2",
+    "@arcblock/ux": "^2.9.2",
+    "@blocklet/constant": "1.16.21-beta-da3f852a",
     "@blocklet/launcher-layout": "2.2.50",
     "@blocklet/list": "^0.12.62",
-    "@blocklet/meta": "1.16.21-beta-2e75c75c",
-    "@blocklet/ui-react": "^2.9.1",
-    "@blocklet/uploader": "^0.0.59",
+    "@blocklet/meta": "1.16.21-beta-da3f852a",
+    "@blocklet/ui-react": "^2.9.2",
+    "@blocklet/uploader": "^0.0.62",
     "@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": "1fca0b58e1ed4f7a9bb268829a7c84290a01c89d",
+  "gitHead": "57b315bdb59f2125c5f0595d5cb21c92196710ba",
   "exports": {
     ".": {
       "import": "./es/index.js",