@abtnode/ux 1.8.69-beta-650a290b → 1.16.0-beta-b16cb035

package/lib/blocklet/migration.js

@@ -12,6 +12,7 @@ var _constant = require("@abtnode/constant");
 var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _util = require("@blocklet/meta/lib/util");
+var _node = require("../contexts/node");
 var _blocklet = require("../contexts/blocklet");
 var _session = require("../contexts/session");
 var _toast = _interopRequireDefault(require("../toast"));
@@ -30,6 +31,31 @@ const findDuplicate = blocklet => {
   });
   return duplicate;
 };
+const getNewHref = (location, blocklet, inService) => {
+  const {
+    hostname,
+    href
+  } = location;
+  if (!blocklet) {
+    return href;
+  }
+  if (inService) {
+    var _blocklet$site;
+    const ipRegex = /\d+[-.]\d+[-.]\d+[-.]\d+/;
+    const match = ipRegex.exec(hostname);
+    if (!match) {
+      return href;
+    }
+    const ip = match[0];
+    const didDomain = (((_blocklet$site = blocklet.site) === null || _blocklet$site === void 0 ? void 0 : _blocklet$site.domainAliases) || []).map(x => x.value).filter(Boolean).find(x => x.endsWith(_constant.DEFAULT_DID_DOMAIN)) || '';
+    const base32Did = didDomain.replace(".".concat(_constant.DEFAULT_DID_DOMAIN), '');
+    if (!base32Did) {
+      return href;
+    }
+    return href.replace(hostname, "".concat(base32Did, "-").concat(ip, ".").concat(_constant.DEFAULT_IP_DOMAIN_SUFFIX));
+  }
+  return href.replace(blocklet.meta.bundleDid, blocklet.appPid);
+};
 function BlockletMigration() {
   const {
     t
@@ -40,6 +66,9 @@ function BlockletMigration() {
   const {
     blocklet
   } = (0, _blocklet.useBlockletContext)();
+  const {
+    inService
+  } = (0, _node.useNodeContext)();
   const [openConnect, setOpenConnect] = (0, _react.useState)(false);
   const [leftSec, setLeftSec] = (0, _react.useState)(5);
   const needMigration = blocklet && blocklet.structVersion !== _constant.APP_STRUCT_VERSION;
@@ -62,10 +91,7 @@ function BlockletMigration() {
     }
   };
   const onSuccess = () => {
-    const {
-      href
-    } = window.location;
-    const newHref = href.replace(blocklet.meta.bundleDid, blocklet.appPid);
+    const newHref = getNewHref(window.location, blocklet, inService);
     setTimeout(() => {
       window.location.href = newHref;
     }, 5000);
@@ -117,9 +143,9 @@ function BlockletMigration() {
       title: t('blocklet.migrate.title'),
       scan: t('blocklet.migrate.scan'),
       confirm: t('blocklet.migrate.confirm'),
-      success: t('blocklet.migrate.success', {
+      success: leftSec >= 0 ? t('blocklet.migrate.success', {
         sec: leftSec
-      })
+      }) : 'Redirecting...'
     },
     onClose: onClose
   })];

package/lib/blocklet/storage.js

@@ -36,12 +36,12 @@ const Container = (0, _styled.default)('div')(_templateObject || (_templateObjec
 
 /**
  * @description 实时显示备份的进度
- * @param {{appPid: string}} {appPid}
+ * @param {{appDid: string}} {appDid}
  * @return {{message: string, progress: number, completed: boolean}}
  */
 function useBackupProgress(_ref) {
   let {
-    appPid
+    appDid
   } = _ref;
   const [progress, setProgress] = (0, _react.useState)({
     message: '',
@@ -52,14 +52,14 @@ function useBackupProgress(_ref) {
   const webSocketClient = node.ws.getWsClient();
   (0, _react.useEffect)(() => {
     webSocketClient.on(_constant.BlockletEvents.backupProgress, data => {
-      if (appPid === (data === null || data === void 0 ? void 0 : data.appPid)) {
+      if (appDid === (data === null || data === void 0 ? void 0 : data.appDid)) {
         setProgress(preValue => _objectSpread(_objectSpread({}, preValue), data));
       }
     });
     return () => {
       webSocketClient.off(_constant.BlockletEvents.backupProgress);
     };
-  }, [appPid, webSocketClient]);
+  }, [appDid, webSocketClient]);
   return progress;
 }
 
@@ -109,7 +109,7 @@ function Storage() {
   const [gatewayUrl, setGatewayUrl] = (0, _react.useState)('');
   const [endpoint, setEndpoint] = (0, _react.useState)(((_blocklet$environment = blocklet.environments.find(e => e.key === _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPACE_ENDPOINT)) === null || _blocklet$environment === void 0 ? void 0 : _blocklet$environment.value) || '');
   const progress = useBackupProgress({
-    appPid: blocklet === null || blocklet === void 0 ? void 0 : blocklet.appPid
+    appDid: blocklet === null || blocklet === void 0 ? void 0 : blocklet.appDid
   });
   const [isLoading, setIsLoading] = (0, _react.useState)(false);
   const appName = (0, _util.getAppName)(blocklet);
@@ -166,7 +166,7 @@ function Storage() {
         baseURL: (0, _urlJoin.default)(gatewayUrl, 'space')
       }).get,
       extraParams: {
-        appDid: blocklet.appPid,
+        appDid: blocklet.appDid,
         appName,
         appDescription,
         scopes: 'list:object read:object write:object',
@@ -191,7 +191,7 @@ function Storage() {
       setIsLoading(true);
       await api.backupToSpaces({
         input: {
-          appPid: blocklet.appPid
+          appDid: blocklet.appDid
         }
       });
       _toast.default.success(t('storage.spaces.backupSuccessfully'));

package/lib/locales/en.js

@@ -33,6 +33,7 @@ module.exports = {
       connect: 'Connect Owner DID Wallet',
       verify: 'Verify Ownership',
       basicSettings: 'Basic Settings',
+      launchApp: 'Launch Application',
       complete: 'Complete'
     },
     congratulation: 'Congratulations! Your Blocklet Server is secure and ready to use',
@@ -1122,6 +1123,12 @@ module.exports = {
       installedButStopped: 'The Blocklet is installed successfully, but cannot be started. You can start it manually after resolving blocking issues',
       installedButError: 'The Blocklet is successfully installed, but failed to start',
       upgradeFailed: 'Upgrade Failed'
+    },
+    steps: {
+      introduction: 'Introduction',
+      installApp: 'Install Application',
+      purchaseSpace: 'Purchase Space',
+      prepareSpace: 'Prepare Space'
     }
   },
   issuePassport: {

package/lib/locales/zh.js

@@ -33,6 +33,7 @@ module.exports = {
       connect: '链接所有者的 DID 钱包',
       verify: '验证所有权',
       basicSettings: '基础设置',
+      launchApp: '启动应用',
       complete: '完成'
     },
     congratulation: '恭喜, 您的节点安全可用!',
@@ -1128,6 +1129,12 @@ module.exports = {
       installedButStopped: '应用安装成功，但是无法启动，解决启动问题之后后可手动启动',
       installedButError: '应用已经安装，但是运行出错了',
       upgradeFailed: '更新失败'
+    },
+    steps: {
+      introduction: '简介',
+      installApp: '安装应用',
+      purchaseSpace: '选购空间',
+      prepareSpace: '准备空间'
     }
   },
   issuePassport: {

package/lib/util/index.js

@@ -117,7 +117,7 @@ function getAccessUrl(hostname) {
   Object.keys(params).forEach(key => {
     searchParams.append(key, params[key]);
   });
-  return "".concat(url, "?").concat(searchParams.toString());
+  return "".concat(url).concat(urlObj.pathname === '/' ? '/' : '', "?").concat(searchParams.toString());
 }
 function getBlockletUrl() {
   let {
@@ -161,8 +161,9 @@ function getBlockletUrls() {
   }
   let mountPoint = inputMountPoint;
   if (!mountPoint) {
+    var _rule$from;
     const rule = site.rules.filter(x => !x.from.pathPrefix.startsWith(_constant.WELLKNOWN_PATH_PREFIX))[0];
-    mountPoint = rule ? rule.name : '/';
+    mountPoint = (0, _normalizePathPrefix.default)((rule === null || rule === void 0 ? void 0 : (_rule$from = rule.from) === null || _rule$from === void 0 ? void 0 : _rule$from.pathPrefix) || '/');
   }
   return domains.map(domain => getAccessUrl(domain.value, mountPoint, params));
 }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.69-beta-650a290b",
+  "version": "1.16.0-beta-b16cb035",
   "description": "UX components shared across abtnode packages",
   "main": "lib/index.js",
   "files": [
@@ -21,19 +21,19 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.69-beta-650a290b",
-    "@abtnode/constant": "1.8.69-beta-650a290b",
-    "@abtnode/util": "1.8.69-beta-650a290b",
-    "@arcblock/did-connect": "^2.5.10",
+    "@abtnode/auth": "1.16.0-beta-b16cb035",
+    "@abtnode/constant": "1.16.0-beta-b16cb035",
+    "@abtnode/util": "1.16.0-beta-b16cb035",
+    "@arcblock/did-connect": "^2.5.12",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.5.10",
-    "@arcblock/terminal": "^2.5.10",
-    "@arcblock/ux": "^2.5.10",
-    "@blocklet/constant": "1.8.69-beta-650a290b",
-    "@blocklet/launcher-layout": "^1.9.65",
+    "@arcblock/icons": "^2.5.12",
+    "@arcblock/terminal": "^2.5.12",
+    "@arcblock/ux": "^2.5.12",
+    "@blocklet/constant": "1.16.0-beta-b16cb035",
+    "@blocklet/launcher-layout": "1.9.65",
     "@blocklet/list": "^0.11.6",
-    "@blocklet/meta": "1.8.69-beta-650a290b",
-    "@blocklet/ui-react": "^2.5.10",
+    "@blocklet/meta": "1.16.0-beta-b16cb035",
+    "@blocklet/ui-react": "^2.5.12",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -86,5 +86,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "a33c9ce6a52b8d522d13860e85809dcbba236712"
+  "gitHead": "138bd91aee5a35b28c2de4e1e924c44932efaf3a"
 }