@abtnode/ux 1.16.21-beta-bd0e2503 → 1.16.21-beta-445a8baa

package/es/blocklet/component/add-component-core.js

@@ -153,6 +153,7 @@ export default function AddComponentCore({
   mode,
   stores,
   resourceType,
+  resourceDid,
   storageKey,
   inDialog
 }) {
@@ -740,6 +741,7 @@ export default function AddComponentCore({
             },
             storeUrl: currentRegistry.url,
             resourceType: resourceType,
+            resourceDid: resourceDid,
             handleButtonClick: chooseParams => {
               setConfigValue({
                 chooseParams: {
@@ -1114,6 +1116,7 @@ AddComponentCore.propTypes = {
   inDialog: PropTypes.bool,
   stores: PropTypes.arrayOf(PropTypes.string),
   resourceType: PropTypes.string,
+  resourceDid: PropTypes.string,
   storageKey: PropTypes.string
 };
 AddComponentCore.defaultProps = {
@@ -1121,6 +1124,7 @@ AddComponentCore.defaultProps = {
   mode: 'normal',
   stores: [],
   resourceType: '',
+  resourceDid: '',
   storageKey: '',
   inDialog: true
 };

package/es/blocklet/component/index.js

@@ -38,7 +38,6 @@ import Tag from '../../tag';
 import BlockletSource from '../blocklet-source';
 import BlockletStatus from '../status';
 import BlockletVersion from '../version';
-import ResourceType from '../resource-type';
 import Confirm from '../../confirm';
 import { useNodeContext } from '../../contexts/node';
 import { formatPerson, formatError, sleep, BlockletAdminRoles, formatToDatetime } from '../../util';
@@ -120,6 +119,7 @@ const getComponentName = (componentId, app) => {
   }
   return names.join(' / ');
 };
+const isPack = component => component?.meta?.group === 'pack';
 function ComponentItem({
   blocklet,
   ancestors,
@@ -182,7 +182,8 @@ function ComponentItem({
     name: t('common.status'),
     value: /*#__PURE__*/_jsx(BlockletStatus, {
       status: status,
-      source: componentInfo.source
+      source: componentInfo.source,
+      progress: blocklet.progress
     })
   }, blocklet.status === 'running' ? {
     name: t('blocklet.startedAt'),
@@ -298,12 +299,8 @@ function ComponentItem({
               marginLeft: 4
             },
             status: status,
-            source: blocklet.source
-          }), !hasStartEngine(blocklet.meta) && /*#__PURE__*/_jsx(ResourceType, {
-            style: {
-              marginLeft: 4
-            },
-            blocklet: blocklet
+            source: blocklet.source,
+            progress: blocklet.progress
           }), /*#__PURE__*/_jsx(BlockletMode, {
             style: {
               marginLeft: 4
@@ -399,7 +396,7 @@ function ComponentItem({
           onClick: () => {
             setComponentInfo(blocklet);
           }
-        } : null, {
+        } : null, !isPack(blocklet) && {
           icon: /*#__PURE__*/_jsx(RestartIcon, {}),
           text: t('common.restart'),
           onClick: () => {
@@ -417,7 +414,7 @@ function ComponentItem({
             });
           },
           disabled: appInProgress || componentInProgress || blocklet.status !== 'running'
-        }, {
+        }, !isPack(blocklet) && {
           icon: /*#__PURE__*/_jsx(ReloadIcon, {}),
           text: t('common.reload'),
           onClick: async () => {

package/es/blocklet/component/store-blocklet-list.js

@@ -135,6 +135,7 @@ export default function BlockletList({
   extraFilter,
   serverVersion,
   resourceType,
+  resourceDid,
   ...rest
 }) {
   const {
@@ -148,13 +149,15 @@ export default function BlockletList({
   const endpoint = storeUrl;
   useEffect(() => {
     setFilters({
-      resourceType
+      resourceType,
+      resourceDid
     });
-  }, [endpoint, resourceType]);
+  }, [endpoint, resourceType, resourceDid]);
   useEffect(() => {
     setInitialized(true);
     setFilters({
-      resourceType
+      resourceType,
+      resourceDid
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -197,7 +200,8 @@ BlockletList.propTypes = {
   handleBlockletRender: PropTypes.func,
   extraFilter: PropTypes.func,
   serverVersion: PropTypes.string,
-  resourceType: PropTypes.string
+  resourceType: PropTypes.string,
+  resourceDid: PropTypes.string
 };
 BlockletList.defaultProps = {
   handleButtonClick: null,
@@ -205,7 +209,8 @@ BlockletList.defaultProps = {
   handleBlockletRender: null,
   extraFilter: undefined,
   serverVersion: '',
-  resourceType: ''
+  resourceType: '',
+  resourceDid: ''
 };
 const StyledBlocklet = styled(Blocklet)`
   .ms-highlight {

package/es/blocklet/overview.js

@@ -71,7 +71,8 @@ export default function BlockletOverview() {
     name: t('common.status'),
     value: /*#__PURE__*/_jsx(BlockletStatus, {
       status: blocklet.status,
-      source: blocklet.source
+      source: blocklet.source,
+      progress: blocklet.progress
     })
   }, isServerless(blocklet) ? {
     name: 'NFT',

package/es/blocklet/publish/create-release.js

@@ -131,7 +131,7 @@ export default function CreateRelease({
   const releaseId = inputReleaseId === 'create' ? '' : inputReleaseId;
   const mode = inputReleaseId === 'create' ? 'create' : 'edit';
   const tabs = [];
-  const resourceComponents = (blocklet?.children || []).filter(x => x.meta.capabilities.resourceExportApi).filter(x => !componentDid || x.meta.did === componentDid);
+  const resourceComponents = (blocklet?.children || []).filter(x => x.meta.resource?.exportApi).filter(x => !componentDid || x.meta.did === componentDid);
   resourceComponents.forEach(item => {
     addComponentTabs({
       tabs,

package/es/blocklet/publish/resource.js

@@ -45,9 +45,9 @@ export default function Resource({
   const releaseId = release.id;
   const readonly = release.status === 'published';
   const {
-    resourceExportApi = '/'
-  } = component?.meta.capabilities || {};
-  const urlObj = new URL(joinUrl('http://127.0.0.1', component.mountPoint, resourceExportApi || '/').replace(/\/+/g, '/'));
+    exportApi = '/'
+  } = component?.meta.resource || {};
+  const urlObj = new URL(joinUrl('http://127.0.0.1', component.mountPoint, exportApi || '/').replace(/\/+/g, '/'));
   urlObj.searchParams.set('projectId', projectId);
   urlObj.searchParams.set('releaseId', releaseId);
   urlObj.searchParams.set('local', locale);

package/es/blocklet/status.js

@@ -16,6 +16,7 @@ export default function BlockletStatus({
   status,
   variant,
   source,
+  progress,
   ...rest
 }) {
   const {
@@ -25,6 +26,7 @@ export default function BlockletStatus({
     added: 'primary',
     waiting: 'warning',
     downloading: 'warning',
+    extracting: 'warning',
     downloaded: 'primary',
     installing: 'warning',
     installed: 'primary',
@@ -42,6 +44,7 @@ export default function BlockletStatus({
     added: colors.grey,
     waiting: colors.yellow,
     downloading: colors.yellow,
+    extracting: colors.yellow,
     downloaded: colors.grey,
     installing: colors.yellow,
     installed: colors.grey,
@@ -77,15 +80,22 @@ export default function BlockletStatus({
       style: {
         marginRight: 5
       }
-    }), statusTxt]
+    }), statusTxt, status === 'downloading' && progress ? /*#__PURE__*/_jsx("div", {
+      style: {
+        marginLeft: 5
+      },
+      children: `${progress} %`
+    }) : null]
   });
 }
 BlockletStatus.propTypes = {
   status: PropTypes.string.isRequired,
   variant: PropTypes.oneOf(['dot', 'tag']),
-  source: PropTypes.string
+  source: PropTypes.string,
+  progress: PropTypes.number
 };
 BlockletStatus.defaultProps = {
   variant: 'tag',
-  source: ''
+  source: '',
+  progress: 0
 };

package/es/hooks/blocklet.js

@@ -6,6 +6,18 @@ import Toast from '@arcblock/ux/lib/Toast';
 import { toSlotDomain, getBlockletUrlParams, getBlockletUrl } from '../util';
 import { fixBlocklet } from '../blocklet/util';
 import { useDomainsAccessibility } from './url-evaluation';
+import parseProgress from '../util/parse-progress';
+const excludeDownloadingStatus = {
+  waiting: 1,
+  installing: 1,
+  installed: 1,
+  starting: 1,
+  running: 1,
+  stopped: 1,
+  upgrading: 1,
+  restarting: 1,
+  deleting: 1
+};
 
 // eslint-disable-next-line import/prefer-default-export
 export function useBlocklet({
@@ -104,6 +116,12 @@ export function useBlocklet({
             fixRuntime: 'merge-old',
             oldBlocklet
           });
+          if (oldBlocklet && excludeDownloadingStatus[data.status]) {
+            oldBlocklet?.children?.forEach(item => {
+              delete item.progress;
+            });
+            delete oldBlocklet.progress;
+          }
           return data;
         });
         setLoading(false);
@@ -137,6 +155,62 @@ export function useBlocklet({
       });
     }
   };
+  const handleProgress = data => {
+    if (!data || data.meta?.did !== blocklet?.meta?.did) {
+      return;
+    }
+    if (data.status === 'extracting') {
+      setBlocklet(oldBlocklet => {
+        if (!oldBlocklet) {
+          return oldBlocklet;
+        }
+        const children = oldBlocklet.children || [];
+        children.forEach(x => {
+          if (x.meta?.bundleDid === data.component?.did) {
+            x.status = data.status;
+          }
+        });
+
+        // 判断当前下载的 children 是否都处于 extracting
+        const extracting = children.every(x => {
+          if (excludeDownloadingStatus[x.status]) {
+            return true;
+          }
+          return x.status === 'extracting';
+        });
+        return {
+          ...oldBlocklet,
+          children,
+          status: extracting ? 'extracting' : oldBlocklet.status
+        };
+      });
+    }
+    if (data.status === 'downloading' && data.total) {
+      setBlocklet(oldBlocklet => {
+        if (!oldBlocklet) {
+          return oldBlocklet;
+        }
+
+        // keep largest files as progress
+        const children = oldBlocklet.children || [];
+        let progress = 100;
+        children.forEach(item => {
+          if (item.meta?.bundleDid === data.component?.did) {
+            item.progress = parseProgress(data.current, data.total);
+            item.status = data.status;
+            if (item.progress < progress) {
+              progress = item.progress;
+            }
+          }
+        });
+        return {
+          ...oldBlocklet,
+          children,
+          progress
+        };
+      });
+    }
+  };
   const refreshDomainStatus = () => {
     if (did && domainListStr) {
       client.checkDomains({
@@ -196,6 +270,7 @@ export function useBlocklet({
   useSubscription(BlockletEvents.installed, handleRefresh, [blocklet?.meta?.did, !disableSubscription]);
   useSubscription(BlockletEvents.upgraded, handleRefresh, [blocklet?.meta?.did, !disableSubscription]);
   useSubscription(BlockletEvents.updated, handleRefresh, [blocklet?.meta?.did, !disableSubscription]);
+  useSubscription(BlockletEvents.downloadBundleProgress, handleProgress, [blocklet?.meta?.did, !disableSubscription]);
   const data = blocklet ? merge(blocklet, {
     site: {
       domainAliases: blocklet.site.domainAliases.map(x => {

package/es/locales/en.js

@@ -509,6 +509,7 @@ export default {
       added: 'Added',
       waiting: 'Waiting',
       downloading: 'Downloading',
+      extracting: 'Extracting',
       installing: 'Installing',
       upgrading: 'Upgrading',
       installed: 'Installed',

package/es/locales/zh.js

@@ -516,6 +516,7 @@ export default {
       added: '已添加',
       waiting: '等待中',
       downloading: '下载中',
+      extracting: '提取中',
       installing: '安装中',
       upgrading: '升级中',
       installed: '已安装',

package/es/util/index.js

@@ -14,7 +14,7 @@ import axios from '@abtnode/util/lib/axios';
 import dayjs from '@abtnode/util/lib/dayjs';
 import formatError from '@abtnode/util/lib/format-error';
 import normalizePathPrefix from '@abtnode/util/lib/normalize-path-prefix';
-import { evaluateURLs, isDidDomain, isIpEcho, isSlpDomain } from '@abtnode/util/lib/url-evaluation';
+import { evaluateURLs } from '@abtnode/util/lib/url-evaluation';
 import checkAccessible from '@abtnode/util/lib/url-evaluation/check-accessible-browser';
 import { BLOCKLET_MODES } from '@blocklet/constant';
 import urlPathFriendly from '@blocklet/meta/lib/url-path-friendly';
@@ -48,18 +48,12 @@ export function getAccessUrl(hostname, path = '', params = undefined) {
   if (!hostname) {
     return '';
   }
-  let protocol = 'http';
-  if (window.location.protocol === 'https:') {
-    if (isIpEcho(hostname) || isSlpDomain(hostname) || isDidDomain(hostname)) {
-      protocol = 'https';
-    }
-  }
   let port = '';
   const browserPort = Number(window.location.port);
   if (process.env.NODE_ENV !== 'development' && browserPort && ![80, 443].includes(browserPort)) {
     port = `:${browserPort}`;
   }
-  const urlObj = new URL(`${protocol}://${hostname}${port}`);
+  const urlObj = new URL(`${window.location.protocol}//${hostname}${port}`);
   urlObj.pathname = path;
   const url = urlObj.href.replace(/\/$/, '');
   if (!params || !Object.keys(params)) {

package/es/util/parse-progress.js

@@ -0,0 +1,10 @@
+// 0~100
+const parseProgress = (current, total) => {
+  const totalNumber = typeof total !== 'number' ? Number(total) : total;
+  if (Number.isNaN(totalNumber) || totalNumber <= 0) {
+    return 0;
+  }
+  const value = Math.floor(current / totalNumber * 100);
+  return Math.min(Math.max(value, 0), 100);
+};
+export default parseProgress;

package/lib/blocklet/component/add-component-core.js

@@ -174,6 +174,7 @@ function AddComponentCore(_ref3) {
     mode,
     stores,
     resourceType,
+    resourceDid,
     storageKey,
     inDialog
   } = _ref3;
@@ -750,6 +751,7 @@ function AddComponentCore(_ref3) {
             },
             storeUrl: currentRegistry.url,
             resourceType: resourceType,
+            resourceDid: resourceDid,
             handleButtonClick: chooseParams => {
               setConfigValue({
                 chooseParams: _objectSpread(_objectSpread({}, chooseParams), {}, {
@@ -1121,6 +1123,7 @@ AddComponentCore.propTypes = {
   inDialog: _propTypes.default.bool,
   stores: _propTypes.default.arrayOf(_propTypes.default.string),
   resourceType: _propTypes.default.string,
+  resourceDid: _propTypes.default.string,
   storageKey: _propTypes.default.string
 };
 AddComponentCore.defaultProps = {
@@ -1128,6 +1131,7 @@ AddComponentCore.defaultProps = {
   mode: 'normal',
   stores: [],
   resourceType: '',
+  resourceDid: '',
   storageKey: '',
   inDialog: true
 };

package/lib/blocklet/component/index.js

@@ -44,7 +44,6 @@ var _tag = _interopRequireDefault(require("../../tag"));
 var _blockletSource = _interopRequireDefault(require("../blocklet-source"));
 var _status = _interopRequireDefault(require("../status"));
 var _version = _interopRequireDefault(require("../version"));
-var _resourceType = _interopRequireDefault(require("../resource-type"));
 var _confirm = _interopRequireDefault(require("../../confirm"));
 var _node = require("../../contexts/node");
 var _util2 = require("../../util");
@@ -138,6 +137,10 @@ const getComponentName = (componentId, app) => {
   }
   return names.join(' / ');
 };
+const isPack = component => {
+  var _component$meta;
+  return (component === null || component === void 0 ? void 0 : (_component$meta = component.meta) === null || _component$meta === void 0 ? void 0 : _component$meta.group) === 'pack';
+};
 function ComponentItem(_ref) {
   var _blocklet$dependents, _blocklet$meta$resour, _blocklet$dependents2, _blocklet$meta, _blocklet$dependents3;
   let {
@@ -202,7 +205,8 @@ function ComponentItem(_ref) {
     name: t('common.status'),
     value: /*#__PURE__*/(0, _jsxRuntime.jsx)(_status.default, {
       status: status,
-      source: componentInfo.source
+      source: componentInfo.source,
+      progress: blocklet.progress
     })
   }, blocklet.status === 'running' ? {
     name: t('blocklet.startedAt'),
@@ -321,12 +325,8 @@ function ComponentItem(_ref) {
               marginLeft: 4
             },
             status: status,
-            source: blocklet.source
-          }), !(0, _util.hasStartEngine)(blocklet.meta) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_resourceType.default, {
-            style: {
-              marginLeft: 4
-            },
-            blocklet: blocklet
+            source: blocklet.source,
+            progress: blocklet.progress
           }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_mode.default, {
             style: {
               marginLeft: 4
@@ -425,7 +425,7 @@ function ComponentItem(_ref) {
           onClick: () => {
             setComponentInfo(blocklet);
           }
-        } : null, {
+        } : null, !isPack(blocklet) && {
           icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Replay.default, {}),
           text: t('common.restart'),
           onClick: () => {
@@ -443,7 +443,7 @@ function ComponentItem(_ref) {
             });
           },
           disabled: appInProgress || componentInProgress || blocklet.status !== 'running'
-        }, {
+        }, !isPack(blocklet) && {
           icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Autorenew.default, {}),
           text: t('common.reload'),
           onClick: async () => {

package/lib/blocklet/component/store-blocklet-list.js

@@ -21,7 +21,7 @@ var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _util2 = require("../../util");
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
-const _excluded = ["handleButtonClick", "handleSearchSelect", "storeUrl", "handleBlockletRender", "extraFilter", "serverVersion", "resourceType"];
+const _excluded = ["handleButtonClick", "handleSearchSelect", "storeUrl", "handleBlockletRender", "extraFilter", "serverVersion", "resourceType", "resourceDid"];
 /* eslint-disable react/no-unstable-nested-components */
 /* eslint-disable react/jsx-wrap-multilines */
 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); }
@@ -154,7 +154,8 @@ function BlockletList(_ref3) {
       handleBlockletRender,
       extraFilter,
       serverVersion,
-      resourceType
+      resourceType,
+      resourceDid
     } = _ref3,
     rest = _objectWithoutProperties(_ref3, _excluded);
   const {
@@ -168,13 +169,15 @@ function BlockletList(_ref3) {
   const endpoint = storeUrl;
   (0, _react.useEffect)(() => {
     setFilters({
-      resourceType
+      resourceType,
+      resourceDid
     });
-  }, [endpoint, resourceType]);
+  }, [endpoint, resourceType, resourceDid]);
   (0, _react.useEffect)(() => {
     setInitialized(true);
     setFilters({
-      resourceType
+      resourceType,
+      resourceDid
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -212,7 +215,8 @@ BlockletList.propTypes = {
   handleBlockletRender: _propTypes.default.func,
   extraFilter: _propTypes.default.func,
   serverVersion: _propTypes.default.string,
-  resourceType: _propTypes.default.string
+  resourceType: _propTypes.default.string,
+  resourceDid: _propTypes.default.string
 };
 BlockletList.defaultProps = {
   handleButtonClick: null,
@@ -220,6 +224,7 @@ BlockletList.defaultProps = {
   handleBlockletRender: null,
   extraFilter: undefined,
   serverVersion: '',
-  resourceType: ''
+  resourceType: '',
+  resourceDid: ''
 };
 const StyledBlocklet = (0, _styled.default)(_Blocklet.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ms-highlight {\n    color: ", ";\n  }\n"])), props => props.theme.palette.primary.main);

package/lib/blocklet/overview.js

@@ -82,7 +82,8 @@ function BlockletOverview() {
     name: t('common.status'),
     value: /*#__PURE__*/(0, _jsxRuntime.jsx)(_status.default, {
       status: blocklet.status,
-      source: blocklet.source
+      source: blocklet.source,
+      progress: blocklet.progress
     })
   }, (0, _util3.isServerless)(blocklet) ? {
     name: 'NFT',

package/lib/blocklet/publish/create-release.js

@@ -147,7 +147,10 @@ function CreateRelease(_ref2) {
   const releaseId = inputReleaseId === 'create' ? '' : inputReleaseId;
   const mode = inputReleaseId === 'create' ? 'create' : 'edit';
   const tabs = [];
-  const resourceComponents = ((blocklet === null || blocklet === void 0 ? void 0 : blocklet.children) || []).filter(x => x.meta.capabilities.resourceExportApi).filter(x => !componentDid || x.meta.did === componentDid);
+  const resourceComponents = ((blocklet === null || blocklet === void 0 ? void 0 : blocklet.children) || []).filter(x => {
+    var _x$meta$resource;
+    return (_x$meta$resource = x.meta.resource) === null || _x$meta$resource === void 0 ? void 0 : _x$meta$resource.exportApi;
+  }).filter(x => !componentDid || x.meta.did === componentDid);
   resourceComponents.forEach(item => {
     addComponentTabs({
       tabs,

package/lib/blocklet/publish/resource.js

@@ -54,9 +54,9 @@ function Resource(_ref) {
   const releaseId = release.id;
   const readonly = release.status === 'published';
   const {
-    resourceExportApi = '/'
-  } = (component === null || component === void 0 ? void 0 : component.meta.capabilities) || {};
-  const urlObj = new URL((0, _urlJoin.default)('http://127.0.0.1', component.mountPoint, resourceExportApi || '/').replace(/\/+/g, '/'));
+    exportApi = '/'
+  } = (component === null || component === void 0 ? void 0 : component.meta.resource) || {};
+  const urlObj = new URL((0, _urlJoin.default)('http://127.0.0.1', component.mountPoint, exportApi || '/').replace(/\/+/g, '/'));
   urlObj.searchParams.set('projectId', projectId);
   urlObj.searchParams.set('releaseId', releaseId);
   urlObj.searchParams.set('local', locale);

package/lib/blocklet/status.js

@@ -13,7 +13,7 @@ var _util = require("@blocklet/meta/lib/util");
 var _dot = _interopRequireDefault(require("../dot"));
 var _tag = _interopRequireDefault(require("../tag"));
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["status", "variant", "source"];
+const _excluded = ["status", "variant", "source", "progress"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -30,7 +30,8 @@ function BlockletStatus(_ref) {
   let {
       status,
       variant,
-      source
+      source,
+      progress
     } = _ref,
     rest = _objectWithoutProperties(_ref, _excluded);
   const {
@@ -40,6 +41,7 @@ function BlockletStatus(_ref) {
     added: 'primary',
     waiting: 'warning',
     downloading: 'warning',
+    extracting: 'warning',
     downloaded: 'primary',
     installing: 'warning',
     installed: 'primary',
@@ -57,6 +59,7 @@ function BlockletStatus(_ref) {
     added: colors.grey,
     waiting: colors.yellow,
     downloading: colors.yellow,
+    extracting: colors.yellow,
     downloaded: colors.grey,
     installing: colors.yellow,
     installed: colors.grey,
@@ -91,15 +94,22 @@ function BlockletStatus(_ref) {
       style: {
         marginRight: 5
       }
-    }), statusTxt]
+    }), statusTxt, status === 'downloading' && progress ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      style: {
+        marginLeft: 5
+      },
+      children: "".concat(progress, " %")
+    }) : null]
   }));
 }
 BlockletStatus.propTypes = {
   status: _propTypes.default.string.isRequired,
   variant: _propTypes.default.oneOf(['dot', 'tag']),
-  source: _propTypes.default.string
+  source: _propTypes.default.string,
+  progress: _propTypes.default.number
 };
 BlockletStatus.defaultProps = {
   variant: 'tag',
-  source: ''
+  source: '',
+  progress: 0
 };

package/lib/hooks/blocklet.js

@@ -12,15 +12,28 @@ var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _util = require("../util");
 var _util2 = require("../blocklet/util");
 var _urlEvaluation = require("./url-evaluation");
+var _parseProgress = _interopRequireDefault(require("../util/parse-progress"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 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); }
+const excludeDownloadingStatus = {
+  waiting: 1,
+  installing: 1,
+  installed: 1,
+  starting: 1,
+  running: 1,
+  stopped: 1,
+  upgrading: 1,
+  restarting: 1,
+  deleting: 1
+};
+
 // eslint-disable-next-line import/prefer-default-export
 function useBlocklet(_ref) {
-  var _blocklet$site, _blocklet$site$domain, _blocklet$meta, _blocklet$meta2, _blocklet$meta3, _blocklet$meta4, _blocklet$meta5, _blocklet$meta6;
+  var _blocklet$site, _blocklet$site$domain, _blocklet$meta2, _blocklet$meta3, _blocklet$meta4, _blocklet$meta5, _blocklet$meta6, _blocklet$meta7, _blocklet$meta8;
   let {
     did,
     client,
@@ -121,6 +134,13 @@ function useBlocklet(_ref) {
             fixRuntime: 'merge-old',
             oldBlocklet
           });
+          if (oldBlocklet && excludeDownloadingStatus[data.status]) {
+            var _oldBlocklet$children;
+            oldBlocklet === null || oldBlocklet === void 0 ? void 0 : (_oldBlocklet$children = oldBlocklet.children) === null || _oldBlocklet$children === void 0 ? void 0 : _oldBlocklet$children.forEach(item => {
+              delete item.progress;
+            });
+            delete oldBlocklet.progress;
+          }
           return data;
         });
         setLoading(false);
@@ -156,6 +176,63 @@ function useBlocklet(_ref) {
       });
     }
   };
+  const handleProgress = data => {
+    var _data$meta3, _blocklet$meta;
+    if (!data || ((_data$meta3 = data.meta) === null || _data$meta3 === void 0 ? void 0 : _data$meta3.did) !== (blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.did)) {
+      return;
+    }
+    if (data.status === 'extracting') {
+      setBlocklet(oldBlocklet => {
+        if (!oldBlocklet) {
+          return oldBlocklet;
+        }
+        const children = oldBlocklet.children || [];
+        children.forEach(x => {
+          var _x$meta, _data$component;
+          if (((_x$meta = x.meta) === null || _x$meta === void 0 ? void 0 : _x$meta.bundleDid) === ((_data$component = data.component) === null || _data$component === void 0 ? void 0 : _data$component.did)) {
+            x.status = data.status;
+          }
+        });
+
+        // 判断当前下载的 children 是否都处于 extracting
+        const extracting = children.every(x => {
+          if (excludeDownloadingStatus[x.status]) {
+            return true;
+          }
+          return x.status === 'extracting';
+        });
+        return _objectSpread(_objectSpread({}, oldBlocklet), {}, {
+          children,
+          status: extracting ? 'extracting' : oldBlocklet.status
+        });
+      });
+    }
+    if (data.status === 'downloading' && data.total) {
+      setBlocklet(oldBlocklet => {
+        if (!oldBlocklet) {
+          return oldBlocklet;
+        }
+
+        // keep largest files as progress
+        const children = oldBlocklet.children || [];
+        let progress = 100;
+        children.forEach(item => {
+          var _item$meta, _data$component2;
+          if (((_item$meta = item.meta) === null || _item$meta === void 0 ? void 0 : _item$meta.bundleDid) === ((_data$component2 = data.component) === null || _data$component2 === void 0 ? void 0 : _data$component2.did)) {
+            item.progress = (0, _parseProgress.default)(data.current, data.total);
+            item.status = data.status;
+            if (item.progress < progress) {
+              progress = item.progress;
+            }
+          }
+        });
+        return _objectSpread(_objectSpread({}, oldBlocklet), {}, {
+          children,
+          progress
+        });
+      });
+    }
+  };
   const refreshDomainStatus = () => {
     if (did && domainListStr) {
       client.checkDomains({
@@ -188,17 +265,17 @@ function useBlocklet(_ref) {
     setDomainStatus(pre => _objectSpread(_objectSpread({}, pre), {}, {
       [data.domain]: _objectSpread(_objectSpread({}, pre[data.domain]), data)
     }));
-  }, [blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.did, !disableSubscription]);
+  }, [blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta2 = blocklet.meta) === null || _blocklet$meta2 === void 0 ? void 0 : _blocklet$meta2.did, !disableSubscription]);
   useSubscription(_constant.BlockletEvents.statusChange, data => {
-    var _data$meta3;
-    if ((data === null || data === void 0 ? void 0 : (_data$meta3 = data.meta) === null || _data$meta3 === void 0 ? void 0 : _data$meta3.did) === blocklet.meta.did) {
+    var _data$meta4;
+    if ((data === null || data === void 0 ? void 0 : (_data$meta4 = data.meta) === null || _data$meta4 === void 0 ? void 0 : _data$meta4.did) === blocklet.meta.did) {
       setBlocklet(oldBlocklet => {
         const newBlocklet = _objectSpread({}, oldBlocklet);
         newBlocklet.status = (0, _constant.fromBlockletStatus)(data.status);
         (newBlocklet.children || []).forEach(x => {
           const y = data.children.find(z => {
-            var _z$meta, _x$meta;
-            return ((_z$meta = z.meta) === null || _z$meta === void 0 ? void 0 : _z$meta.did) === ((_x$meta = x.meta) === null || _x$meta === void 0 ? void 0 : _x$meta.did);
+            var _z$meta, _x$meta2;
+            return ((_z$meta = z.meta) === null || _z$meta === void 0 ? void 0 : _z$meta.did) === ((_x$meta2 = x.meta) === null || _x$meta2 === void 0 ? void 0 : _x$meta2.did);
           });
           if (y) {
             x.status = (0, _constant.fromBlockletStatus)(y.status);
@@ -208,11 +285,12 @@ function useBlocklet(_ref) {
       });
       handleRefreshWithoutRuntime(data);
     }
-  }, [blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta2 = blocklet.meta) === null || _blocklet$meta2 === void 0 ? void 0 : _blocklet$meta2.did, !disableSubscription]); // eslint-disable-line prettier/prettier
-  useSubscription(_constant.BlockletEvents.storeChange, handleRefreshWithoutRuntime, [blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta3 = blocklet.meta) === null || _blocklet$meta3 === void 0 ? void 0 : _blocklet$meta3.did, !disableSubscription]);
-  useSubscription(_constant.BlockletEvents.installed, handleRefresh, [blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta4 = blocklet.meta) === null || _blocklet$meta4 === void 0 ? void 0 : _blocklet$meta4.did, !disableSubscription]);
-  useSubscription(_constant.BlockletEvents.upgraded, handleRefresh, [blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta5 = blocklet.meta) === null || _blocklet$meta5 === void 0 ? void 0 : _blocklet$meta5.did, !disableSubscription]);
-  useSubscription(_constant.BlockletEvents.updated, handleRefresh, [blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta6 = blocklet.meta) === null || _blocklet$meta6 === void 0 ? void 0 : _blocklet$meta6.did, !disableSubscription]);
+  }, [blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta3 = blocklet.meta) === null || _blocklet$meta3 === void 0 ? void 0 : _blocklet$meta3.did, !disableSubscription]); // eslint-disable-line prettier/prettier
+  useSubscription(_constant.BlockletEvents.storeChange, handleRefreshWithoutRuntime, [blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta4 = blocklet.meta) === null || _blocklet$meta4 === void 0 ? void 0 : _blocklet$meta4.did, !disableSubscription]);
+  useSubscription(_constant.BlockletEvents.installed, handleRefresh, [blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta5 = blocklet.meta) === null || _blocklet$meta5 === void 0 ? void 0 : _blocklet$meta5.did, !disableSubscription]);
+  useSubscription(_constant.BlockletEvents.upgraded, handleRefresh, [blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta6 = blocklet.meta) === null || _blocklet$meta6 === void 0 ? void 0 : _blocklet$meta6.did, !disableSubscription]);
+  useSubscription(_constant.BlockletEvents.updated, handleRefresh, [blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta7 = blocklet.meta) === null || _blocklet$meta7 === void 0 ? void 0 : _blocklet$meta7.did, !disableSubscription]);
+  useSubscription(_constant.BlockletEvents.downloadBundleProgress, handleProgress, [blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta8 = blocklet.meta) === null || _blocklet$meta8 === void 0 ? void 0 : _blocklet$meta8.did, !disableSubscription]);
   const data = blocklet ? (0, _merge.default)(blocklet, {
     site: {
       domainAliases: blocklet.site.domainAliases.map(x => {

package/lib/locales/en.js

@@ -515,6 +515,7 @@ var _default = exports.default = {
       added: 'Added',
       waiting: 'Waiting',
       downloading: 'Downloading',
+      extracting: 'Extracting',
       installing: 'Installing',
       upgrading: 'Upgrading',
       installed: 'Installed',

package/lib/locales/zh.js

@@ -522,6 +522,7 @@ var _default = exports.default = {
       added: '已添加',
       waiting: '等待中',
       downloading: '下载中',
+      extracting: '提取中',
       installing: '安装中',
       upgrading: '升级中',
       installed: '已安装',

package/lib/util/index.js

@@ -95,18 +95,12 @@ function getAccessUrl(hostname) {
   if (!hostname) {
     return '';
   }
-  let protocol = 'http';
-  if (window.location.protocol === 'https:') {
-    if ((0, _urlEvaluation.isIpEcho)(hostname) || (0, _urlEvaluation.isSlpDomain)(hostname) || (0, _urlEvaluation.isDidDomain)(hostname)) {
-      protocol = 'https';
-    }
-  }
   let port = '';
   const browserPort = Number(window.location.port);
   if (process.env.NODE_ENV !== 'development' && browserPort && ![80, 443].includes(browserPort)) {
     port = ":".concat(browserPort);
   }
-  const urlObj = new URL("".concat(protocol, "://").concat(hostname).concat(port));
+  const urlObj = new URL("".concat(window.location.protocol, "//").concat(hostname).concat(port));
   urlObj.pathname = path;
   const url = urlObj.href.replace(/\/$/, '');
   if (!params || !Object.keys(params)) {

package/lib/util/parse-progress.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+// 0~100
+const parseProgress = (current, total) => {
+  const totalNumber = typeof total !== 'number' ? Number(total) : total;
+  if (Number.isNaN(totalNumber) || totalNumber <= 0) {
+    return 0;
+  }
+  const value = Math.floor(current / totalNumber * 100);
+  return Math.min(Math.max(value, 0), 100);
+};
+var _default = exports.default = parseProgress;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.21-beta-bd0e2503",
+  "version": "1.16.21-beta-445a8baa",
   "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.21-beta-bd0e2503",
-    "@abtnode/constant": "1.16.21-beta-bd0e2503",
-    "@abtnode/util": "1.16.21-beta-bd0e2503",
+    "@abtnode/auth": "1.16.21-beta-445a8baa",
+    "@abtnode/constant": "1.16.21-beta-445a8baa",
+    "@abtnode/util": "1.16.21-beta-445a8baa",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.107",
     "@arcblock/did-connect": "^2.8.23",
@@ -39,10 +39,10 @@
     "@arcblock/react-hooks": "^2.8.23",
     "@arcblock/terminal": "^2.8.23",
     "@arcblock/ux": "^2.8.23",
-    "@blocklet/constant": "1.16.21-beta-bd0e2503",
+    "@blocklet/constant": "1.16.21-beta-445a8baa",
     "@blocklet/launcher-layout": "2.2.48",
     "@blocklet/list": "^0.12.60",
-    "@blocklet/meta": "1.16.21-beta-bd0e2503",
+    "@blocklet/meta": "1.16.21-beta-445a8baa",
     "@blocklet/ui-react": "^2.8.23",
     "@blocklet/uploader": "^0.0.56",
     "@emotion/react": "^11.10.4",
@@ -102,7 +102,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "f4550e061b661cb67d7f1413ada51f3f6491f0b8",
+  "gitHead": "7a7ff8be7f424775c3bde0eead773d8e6177fa1a",
   "exports": {
     ".": {
       "import": "./es/index.js",