@abtnode/ux 1.16.0-beta-b16cb035 → 1.16.0-beta-1d6c582e

package/lib/blocklet/component/add.js

@@ -25,6 +25,7 @@ var _context = require("@arcblock/ux/lib/Locale/context");
 var _constant = require("@blocklet/constant");
 var _launcherLayout = _interopRequireDefault(require("@blocklet/launcher-layout"));
 var _step = require("@blocklet/launcher-layout/lib/context/step");
+var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _constant2 = require("@abtnode/constant");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Alert = _interopRequireDefault(require("@arcblock/ux/lib/Alert"));
@@ -43,6 +44,7 @@ var _agreement = _interopRequireDefault(require("../agreement"));
 var _installFromUrl = _interopRequireDefault(require("../install-from-url"));
 var _selectStore = _interopRequireDefault(require("./select-store"));
 var _storeBlockletList = _interopRequireDefault(require("./store-blocklet-list"));
+var _spaceConnector = _interopRequireDefault(require("./space-connector"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
 const _excluded = ["name", "validation"],
@@ -57,6 +59,14 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 requirePurchase = meta => meta.inStore && (0, _util.isFreeBlocklet)(meta) === false;
+const getDIDSpaceCapability = meta => {
+  var _meta$capabilities;
+  return meta === null || meta === void 0 ? void 0 : (_meta$capabilities = meta.capabilities) === null || _meta$capabilities === void 0 ? void 0 : _meta$capabilities.didSpace;
+};
+const getDIDSpaceEndpoint = blocklet => {
+  var _blocklet$configs, _blocklet$configs$fin;
+  return (blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$configs = blocklet.configs) === null || _blocklet$configs === void 0 ? void 0 : (_blocklet$configs$fin = _blocklet$configs.find(item => item.key === _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPACE_ENDPOINT)) === null || _blocklet$configs$fin === void 0 ? void 0 : _blocklet$configs$fin.value) || null;
+};
 const hasRequiredEnvironments = meta => (meta.environments || []).some(x => x.required);
 const hasMissRequiredConfigs = (configsList, sharedValueMap) => {
   return configsList === null || configsList === void 0 ? void 0 : configsList.some(item => {
@@ -161,6 +171,7 @@ function AddComponent(_ref2) {
     hasEnvironmentsStep: false,
     hasRequiredEnvironments: false,
     requirePurchase: false,
+    didSpaceCapability: null,
     installResultProps: {},
     purchaseResultProps: {},
     showFromUrlDialog: false
@@ -556,12 +567,16 @@ function AddComponent(_ref2) {
 
     // eslint-disable-next-line no-shadow
     const componentRequirePurchase = requirePurchase(component.current.meta);
+    const componentDIDSpaceCapability = getDIDSpaceCapability(component.current.meta);
+    const didSpaceEndpoint = getDIDSpaceEndpoint(blocklet);
     updateParams(_objectSpread(_objectSpread({
       bundleDid,
       componentDid
     }, doc), {}, {
       hasRequiredEnvironments: hasRequiredEnvironments(component.current.meta),
-      requirePurchase: componentRequirePurchase
+      requirePurchase: componentRequirePurchase,
+      didSpaceCapability: componentDIDSpaceCapability,
+      didSpaceEndpoint
     }));
     if (isInit && componentRequirePurchase) {
       onGeneratePurchaseData();
@@ -885,6 +900,48 @@ function AddComponent(_ref2) {
     confirm: t('common.next'),
     onCancel: _onCancel,
     onConfirm: onNext
+  }, meta && (params === null || params === void 0 ? void 0 : params.didSpaceCapability) && {
+    key: 'didSpace',
+    name: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+      children: [t('blocklet.component.didSpaceConfig'), " ", params.didSpaceCapability === 'required' && /*#__PURE__*/(0, _jsxRuntime.jsx)(_required.default, {})]
+    }),
+    disabled: params.didSpaceCapability === 'required' && !params.didSpaceEndpoint,
+    body: () => {
+      return /*#__PURE__*/(0, _jsxRuntime.jsxs)(TypographyWrapper, {
+        component: "div",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(PageHeaderWrapper, {
+          title: t('blocklet.component.didSpaceConfig'),
+          subTitle: t('blocklet.component.didSpaceConfigTip')
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+          sx: {
+            mt: '36px',
+            '& > div': {
+              maxWidth: 'unset !important',
+              '& .MuiAutocomplete-root': {
+                maxWidth: 'unset !important'
+              }
+            }
+          },
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_spaceConnector.default, {
+            sx: {
+              '& .MuiFormHelperText-root': {
+                wordBreak: 'break-all'
+              }
+            },
+            helperText: params.didSpaceEndpoint && t('blocklet.component.didSpaceConnected', {
+              endpoint: params.didSpaceEndpoint
+            }),
+            onConnect: () => {
+              onNext();
+            }
+          })
+        })]
+      });
+    },
+    cancel: t('common.pre'),
+    confirm: t('common.next'),
+    onCancel: _onCancel,
+    onConfirm: onNext
   }, {
     key: 'install',
     name: t('common.install'),

package/lib/blocklet/component/delete.js

@@ -47,7 +47,7 @@ function DeleteComponent(_ref) {
   const btn = /*#__PURE__*/(0, _jsxRuntime.jsx)(StyledButton, {
     disabled: componentDisabled,
     onClick: () => setDeleteSetting({
-      title: t('blocklet.component.delete'),
+      title: "".concat(t('common.delete'), " ").concat(component.meta.title || component.meta.name),
       // eslint-disable-next-line react/no-unstable-nested-components
       description: (params, setParams) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Typography.default, {
         component: "div",

package/lib/blocklet/component/space-connector.js

@@ -0,0 +1,208 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
+var _context = require("@arcblock/ux/lib/Locale/context");
+var _constant = require("@blocklet/constant");
+var _axios = _interopRequireDefault(require("axios"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _urlJoin = _interopRequireDefault(require("url-join"));
+var _lodash = require("lodash");
+var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
+var _util = require("@blocklet/meta/lib/util");
+var _blocklet = require("../../../lib/contexts/blocklet");
+var _node = require("../../contexts/node");
+var _toast = _interopRequireDefault(require("../../../lib/toast"));
+var _spaceSelector = _interopRequireDefault(require("./space-selector"));
+var _jsxRuntime = require("react/jsx-runtime");
+const _excluded = ["onConnect"];
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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); }
+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; }
+/**
+ *
+ *
+ * @param {import('@abtnode/client').BlockletState} blocklet
+ * @return {*}
+ */
+function useAppUrl(blocklet) {
+  var _blocklet$site, _blocklet$site$domain, _blocklet$site$domain2;
+  const appUrls = blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$site = blocklet.site) === null || _blocklet$site === void 0 ? void 0 : (_blocklet$site$domain = _blocklet$site.domainAliases) === null || _blocklet$site$domain === void 0 ? void 0 : (_blocklet$site$domain2 = _blocklet$site$domain.sort((a, b) => {
+    if (a.accessibility.accessible && b.accessibility.accessible) {
+      return +a.isProtected - +b.isProtected;
+    }
+    return +b.accessibility.accessible - +a.accessibility.accessible;
+  })) === null || _blocklet$site$domain2 === void 0 ? void 0 : _blocklet$site$domain2.map(domainAlias => {
+    var _domainAlias$domainSt;
+    const protocol = domainAlias !== null && domainAlias !== void 0 && (_domainAlias$domainSt = domainAlias.domainStatus) !== null && _domainAlias$domainSt !== void 0 && _domainAlias$domainSt.isHttps ? 'https://' : 'http://';
+    const value = domainAlias === null || domainAlias === void 0 ? void 0 : domainAlias.value;
+    return "".concat(protocol).concat(value);
+  }).filter(Boolean);
+  const appUrl = appUrls === null || appUrls === void 0 ? void 0 : appUrls[0];
+
+  // 授权的时候提供 appUrl, 因为 appUrl 可能很久都拿不到值，所以加一个 loading 效果过渡一下
+  return {
+    appUrl,
+    isReady: Boolean(appUrl)
+  };
+}
+const SpaceConnector = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
+  let {
+      onConnect
+    } = _ref,
+    restProps = _objectWithoutProperties(_ref, _excluded);
+  /** @type {{ api: import('@abtnode/client').ABTNodeClient, info: import('@abtnode/client').NodeState  }} */
+  const {
+    api,
+    info
+  } = (0, _node.useNodeContext)();
+  const nodeDid = info.did;
+  const {
+    t,
+    locale
+  } = (0, _react.useContext)(_context.LocaleContext);
+  /** @type {{ blocklet: import('@abtnode/client').BlockletState }} */
+  const {
+    blocklet
+  } = (0, _blocklet.useBlockletContext)();
+  const [gatewayUrl, setGatewayUrl] = (0, _react.useState)('');
+  const spaceProps = (0, _react.useMemo)(() => {
+    var _blocklet$environment, _blocklet$environment2, _blocklet$environment3, _blocklet$environment4;
+    return {
+      endpoint: (blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$environment = blocklet.environments) === null || _blocklet$environment === void 0 ? void 0 : (_blocklet$environment2 = _blocklet$environment.find(e => e.key === _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPACE_ENDPOINT)) === null || _blocklet$environment2 === void 0 ? void 0 : _blocklet$environment2.value) || '',
+      gatewayUrl: (blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$environment3 = blocklet.environments) === null || _blocklet$environment3 === void 0 ? void 0 : (_blocklet$environment4 = _blocklet$environment3.find(e => e.key === _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPACES_URL)) === null || _blocklet$environment4 === void 0 ? void 0 : _blocklet$environment4.value) || ''
+    };
+  }, [blocklet]);
+  const appName = (0, _util.getAppName)(blocklet);
+  const appDescription = (0, _util.getAppDescription)(blocklet);
+  const {
+    appUrl,
+    isReady
+  } = useAppUrl(blocklet);
+  async function saveSpaceConnectorEndpoint(did, storageEndpoint) {
+    await api.configBlocklet({
+      input: {
+        did: [did],
+        configs: [{
+          key: _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPACES_URL,
+          value: gatewayUrl
+        }, {
+          key: _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPACE_ENDPOINT,
+          value: storageEndpoint
+        }]
+      }
+    }).then(() => {
+      _toast.default.success(t('storage.spaces.connected', locale));
+    }).catch(error => {
+      console.error(error);
+      _toast.default.error(error.message);
+    });
+  }
+  const onAuthorizeConnectSuccess = async (response, decrypt) => {
+    await saveSpaceConnectorEndpoint(blocklet.meta.did, decrypt(response.endpoint));
+    setTimeout(() => {
+      setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
+        open: false
+      }));
+      onConnect === null || onConnect === void 0 ? void 0 : onConnect();
+    }, 3000);
+  };
+  const [authorizeConnect, setAuthorizeConnect] = (0, _react.useState)({
+    open: false
+  });
+
+  // eslint-disable-next-line no-shadow
+  const handleOnClickAuthorize = async gatewayUrl => {
+    if ((0, _lodash.isEmpty)(gatewayUrl)) {
+      _toast.default.error(t('storage.spaces.addressCannotEmpty', locale));
+      return;
+    }
+    setGatewayUrl(gatewayUrl);
+    setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
+      action: 'one-click-authorization',
+      checkTimeout: 1000 * 300,
+      prefix: (0, _urlJoin.default)(gatewayUrl, 'space/api/did'),
+      baseUrl: new URL(gatewayUrl).origin,
+      checkFn: _axios.default.create({
+        baseURL: (0, _urlJoin.default)(gatewayUrl, 'space')
+      }).get,
+      extraParams: {
+        appDid: blocklet.appDid,
+        appName,
+        appDescription,
+        scopes: 'list:object read:object write:object',
+        appUrl,
+        referrer: window.location.href,
+        nodeDid
+      },
+      onClose: () => {
+        // eslint-disable-next-line no-shadow
+        setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
+          open: false
+        }));
+      },
+      open: true
+    }));
+  };
+  (0, _react.useEffect)(() => {
+    setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
+      messages: {
+        title: t('storage.spaces.authorize.title', {
+          appName
+        }),
+        scan: t('storage.spaces.authorize.scan', {
+          appName
+        }),
+        confirm: '',
+        success: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
+          gutterBottom: true,
+          children: t('storage.spaces.authorize.success')
+        })
+      }
+    }));
+  }, [appName, locale, t]);
+  (0, _react.useImperativeHandle)(ref, () => ({
+    getEndpoint: () => spaceProps.endpoint,
+    getGatewayUrl: () => spaceProps.gatewayUrl
+  }));
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_spaceSelector.default, _objectSpread(_objectSpread(_objectSpread({}, restProps), spaceProps), {}, {
+      onSelect: handleOnClickAuthorize,
+      loading: !isReady
+    })), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Connect.default, {
+      forceConnected: false,
+      saveConnect: false,
+      prefix: authorizeConnect.prefix,
+      open: authorizeConnect.open,
+      popup: true,
+      action: authorizeConnect.action,
+      baseUrl: authorizeConnect.baseUrl,
+      checkFn: authorizeConnect.checkFn,
+      onSuccess: onAuthorizeConnectSuccess,
+      onClose: authorizeConnect.onClose,
+      checkTimeout: authorizeConnect.checkTimeout,
+      extraParams: authorizeConnect.extraParams,
+      messages: authorizeConnect.messages,
+      locale: locale
+    })]
+  });
+});
+SpaceConnector.propTypes = {
+  onConnect: _propTypes.default.func
+};
+SpaceConnector.defaultProps = {
+  onConnect: () => {}
+};
+var _default = SpaceConnector;
+exports.default = _default;

package/lib/blocklet/component/{space-gateway-selector.js → space-selector.js}

@@ -18,7 +18,7 @@ var _session = require("../../../lib/contexts/session");
 var _toast = _interopRequireDefault(require("../../toast"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
-const _excluded = ["onSelect", "endpoint", "loading"];
+const _excluded = ["onSelect", "endpoint", "gatewayUrl", "loading", "size", "helperText"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -40,15 +40,18 @@ const DEFAULT_GATEWAY_LIST = [{
   avatar: 'S'
 }];
 const filter = (0, _Autocomplete.createFilterOptions)();
-function SpaceGatewaySelector(_ref) {
+function SpaceSelector(_ref) {
   let {
       onSelect,
       endpoint,
-      loading
+      gatewayUrl: defaultGatewayUrl,
+      loading,
+      size,
+      helperText
     } = _ref,
     rest = _objectWithoutProperties(_ref, _excluded);
   const [gatewayList, setGatewayList] = (0, _useLocalStorage.default)('did-space-gateway-list', DEFAULT_GATEWAY_LIST);
-  const [gatewayUrl, setGatewayUrl] = (0, _useLocalStorage.default)('did-space-gateway-url', DEFAULT_GATEWAY_LIST[0].value);
+  const [gatewayUrl, setGatewayUrl] = (0, _react.useState)(defaultGatewayUrl || DEFAULT_GATEWAY_LIST[0].value);
   const {
     t
   } = (0, _context.useLocaleContext)();
@@ -134,8 +137,9 @@ function SpaceGatewaySelector(_ref) {
     },
     renderInput: params => {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, _objectSpread(_objectSpread({}, params), {}, {
+        helperText: helperText,
         label: t('storage.spaces.label'),
-        size: "small",
+        size: size,
         InputProps: _objectSpread(_objectSpread({}, params.InputProps), {}, {
           type: 'search',
           endAdornment: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
@@ -161,14 +165,20 @@ function SpaceGatewaySelector(_ref) {
   }));
 }
 const Container = (0, _styled.default)(_Autocomplete.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  height: 40px;\n  width: 100%;\n  max-width: 720px;\n  ", " {\n    width: 75%;\n  }\n  input.MuiInputBase-input {\n    max-width: calc(100% - 80px);\n  }\n"])), props => props.theme.breakpoints.down('md'));
-SpaceGatewaySelector.propTypes = {
+SpaceSelector.propTypes = {
   onSelect: _propTypes.default.func.isRequired,
   endpoint: _propTypes.default.string,
-  loading: _propTypes.default.bool
+  loading: _propTypes.default.bool,
+  size: _propTypes.default.string,
+  helperText: _propTypes.default.string,
+  gatewayUrl: _propTypes.default.string
 };
-SpaceGatewaySelector.defaultProps = {
+SpaceSelector.defaultProps = {
   endpoint: undefined,
-  loading: false
+  loading: false,
+  size: 'small',
+  helperText: '',
+  gatewayUrl: ''
 };
-var _default = SpaceGatewaySelector;
+var _default = SpaceSelector;
 exports.default = _default;

package/lib/blocklet/storage.js

@@ -6,21 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = Storage;
 var _react = _interopRequireWildcard(require("react"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
-var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _constant = require("@blocklet/constant");
-var _axios = _interopRequireDefault(require("axios"));
-var _urlJoin = _interopRequireDefault(require("url-join"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
-var _lodash = require("lodash");
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _material = require("@mui/material");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
-var _util = require("@blocklet/meta/lib/util");
 var _blocklet = require("../../lib/contexts/blocklet");
 var _node = require("../contexts/node");
 var _toast = _interopRequireDefault(require("../../lib/toast"));
-var _spaceGatewaySelector = _interopRequireDefault(require("./component/space-gateway-selector"));
+var _spaceConnector = _interopRequireDefault(require("./component/space-connector"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -62,127 +57,26 @@ function useBackupProgress(_ref) {
   }, [appDid, webSocketClient]);
   return progress;
 }
-
-/**
- *
- *
- * @param {import('@abtnode/client').BlockletState} blocklet
- * @return {*}
- */
-function useAppUrl(blocklet) {
-  var _blocklet$site, _blocklet$site$domain, _blocklet$site$domain2;
-  const appUrls = blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$site = blocklet.site) === null || _blocklet$site === void 0 ? void 0 : (_blocklet$site$domain = _blocklet$site.domainAliases) === null || _blocklet$site$domain === void 0 ? void 0 : (_blocklet$site$domain2 = _blocklet$site$domain.sort((a, b) => {
-    if (a.accessibility.accessible && b.accessibility.accessible) {
-      return +a.isProtected - +b.isProtected;
-    }
-    return +b.accessibility.accessible - +a.accessibility.accessible;
-  })) === null || _blocklet$site$domain2 === void 0 ? void 0 : _blocklet$site$domain2.map(domainAlias => {
-    var _domainAlias$domainSt;
-    const protocol = domainAlias !== null && domainAlias !== void 0 && (_domainAlias$domainSt = domainAlias.domainStatus) !== null && _domainAlias$domainSt !== void 0 && _domainAlias$domainSt.isHttps ? 'https://' : 'http://';
-    const value = domainAlias === null || domainAlias === void 0 ? void 0 : domainAlias.value;
-    return "".concat(protocol).concat(value);
-  }).filter(Boolean);
-  const appUrl = appUrls === null || appUrls === void 0 ? void 0 : appUrls[0];
-
-  // 授权的时候提供 appUrl, 因为 appUrl 可能很久都拿不到值，所以加一个 loading 效果过渡一下
-  return {
-    appUrl,
-    isReady: Boolean(appUrl)
-  };
-}
 function Storage() {
-  var _blocklet$environment;
   /** @type {{ api: import('@abtnode/client').ABTNodeClient, info: import('@abtnode/client').NodeState  }} */
   const {
-    api,
-    info
+    api
   } = (0, _node.useNodeContext)();
-  const nodeDid = info.did;
   const {
-    t,
-    locale
+    t
   } = (0, _react.useContext)(_context.LocaleContext);
   /** @type {{ blocklet: import('@abtnode/client').BlockletState }} */
   const {
     blocklet
   } = (0, _blocklet.useBlockletContext)();
-  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 endpoint = (0, _react.useMemo)(() => {
+    var _blocklet$environment;
+    return ((_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) || '';
+  }, [blocklet]);
   const progress = useBackupProgress({
     appDid: blocklet === null || blocklet === void 0 ? void 0 : blocklet.appDid
   });
   const [isLoading, setIsLoading] = (0, _react.useState)(false);
-  const appName = (0, _util.getAppName)(blocklet);
-  const appDescription = (0, _util.getAppDescription)(blocklet);
-  const {
-    appUrl,
-    isReady
-  } = useAppUrl(blocklet);
-  async function saveStorageEndpoint(did, storageEndpoint) {
-    await api.configBlocklet({
-      input: {
-        did: [did],
-        configs: [{
-          key: _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPACES_URL,
-          value: gatewayUrl
-        }, {
-          key: _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPACE_ENDPOINT,
-          value: storageEndpoint
-        }]
-      }
-    }).then(() => {
-      _toast.default.success(t('storage.spaces.connected', locale));
-    }).catch(error => {
-      console.error(error);
-      _toast.default.error(error.message);
-    });
-  }
-  const onAuthorizeConnectSuccess = async (response, decrypt) => {
-    setEndpoint(decrypt(response.endpoint));
-    await saveStorageEndpoint(blocklet.meta.did, decrypt(response.endpoint));
-    setTimeout(() => {
-      setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
-        open: false
-      }));
-    }, 3000);
-  };
-  const [authorizeConnect, setAuthorizeConnect] = (0, _react.useState)({
-    open: false
-  });
-
-  // eslint-disable-next-line no-shadow
-  const handleOnClickAuthorize = async gatewayUrl => {
-    if ((0, _lodash.isEmpty)(gatewayUrl)) {
-      _toast.default.error(t('storage.spaces.addressCannotEmpty', locale));
-      return;
-    }
-    setGatewayUrl(gatewayUrl);
-    setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
-      action: 'one-click-authorization',
-      checkTimeout: 1000 * 300,
-      prefix: (0, _urlJoin.default)(gatewayUrl, 'space/api/did'),
-      baseUrl: new URL(gatewayUrl).origin,
-      checkFn: _axios.default.create({
-        baseURL: (0, _urlJoin.default)(gatewayUrl, 'space')
-      }).get,
-      extraParams: {
-        appDid: blocklet.appDid,
-        appName,
-        appDescription,
-        scopes: 'list:object read:object write:object',
-        appUrl,
-        referrer: window.location.href,
-        nodeDid
-      },
-      onClose: () => {
-        // eslint-disable-next-line no-shadow
-        setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
-          open: false
-        }));
-      },
-      open: true
-    }));
-  };
   const onBackup = async () => {
     try {
       if (isLoading) {
@@ -202,23 +96,6 @@ function Storage() {
       setIsLoading(false);
     }
   };
-  (0, _react.useEffect)(() => {
-    setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
-      messages: {
-        title: t('storage.spaces.authorize.title', {
-          appName
-        }),
-        scan: t('storage.spaces.authorize.scan', {
-          appName
-        }),
-        confirm: '',
-        success: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
-          gutterBottom: true,
-          children: t('storage.spaces.authorize.success')
-        })
-      }
-    }));
-  }, [appName, locale, t]);
   (0, _react.useEffect)(() => {
     if (progress !== null && progress !== void 0 && progress.completed) {
       setIsLoading(false);
@@ -233,14 +110,11 @@ function Storage() {
     style: {
       maxWidth: '720px'
     },
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_spaceGatewaySelector.default, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_spaceConnector.default, {
       sx: {
         marginTop: '24px',
         marginBottom: '40px'
-      },
-      onSelect: handleOnClickAuthorize,
-      endpoint: endpoint,
-      loading: !isReady
+      }
     }), endpoint && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
       mt: 3,
       display: "flex",
@@ -301,22 +175,8 @@ function Storage() {
           })
         })]
       })]
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Connect.default, {
-      forceConnected: false,
-      saveConnect: false,
-      prefix: authorizeConnect.prefix,
-      open: authorizeConnect.open,
-      popup: true,
-      action: authorizeConnect.action,
-      baseUrl: authorizeConnect.baseUrl,
-      checkFn: authorizeConnect.checkFn,
-      onSuccess: onAuthorizeConnectSuccess,
-      onClose: authorizeConnect.onClose,
-      checkTimeout: authorizeConnect.checkTimeout,
-      extraParams: authorizeConnect.extraParams,
-      messages: authorizeConnect.messages,
-      locale: locale
     })]
   });
 }
-Storage.propTypes = {};
+Storage.propTypes = {};
+Storage.defaultProps = {};

package/lib/blocklet/util.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.downloadExportedSource = downloadExportedSource;
 exports.fixBlocklet = exports.ensureDomainAliases = void 0;
 exports.genExportedMeta = genExportedMeta;
-exports.getLaunchAgreementUrl = void 0;
+exports.getLaunchAgreementUrl = exports.getAppCapabilities = void 0;
 exports.getNameByTitle = getNameByTitle;
 exports.getServerUrl = void 0;
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
@@ -21,7 +21,8 @@ var _didMotif = require("@arcblock/did-motif");
 var _normalizePathPrefix = _interopRequireDefault(require("@abtnode/util/lib/normalize-path-prefix"));
 var _did = _interopRequireDefault(require("@blocklet/meta/lib/did"));
 var _util = require("@blocklet/meta/lib/util");
-var _constant = require("@abtnode/constant");
+var _constant = require("@blocklet/constant");
+var _constant2 = require("@abtnode/constant");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const base64ToArrayBuffer = base64 => {
   const bufStr = window.atob(base64);
@@ -131,7 +132,7 @@ const ensureDomainAliases = async function ensureDomainAliases(domainAliases) {
   if (!getIP) {
     return domainAliases;
   }
-  if (!domainAliases.some(x => x.value.includes(_constant.SLOT_FOR_IP_DNS_SITE))) {
+  if (!domainAliases.some(x => x.value.includes(_constant2.SLOT_FOR_IP_DNS_SITE))) {
     return domainAliases;
   }
   const ip = await getIP();
@@ -148,6 +149,24 @@ const ensureDomainAliases = async function ensureDomainAliases(domainAliases) {
   }).filter(Boolean);
 };
 
+/** @type {import('@abtnode/client').BlockletState} */
+exports.ensureDomainAliases = ensureDomainAliases;
+const getAppCapabilities = blocklet => {
+  const capabilities = {
+    didSpace: null
+  };
+  (0, _util.forEachBlockletSync)(blocklet, b => {
+    var _b$meta, _b$meta$capabilities;
+    if (capabilities.didSpace === _constant.BLOCKLET_APP_SPACE_ENDPOINTS.REQUIRED) {
+      return;
+    }
+    if (b !== null && b !== void 0 && (_b$meta = b.meta) !== null && _b$meta !== void 0 && (_b$meta$capabilities = _b$meta.capabilities) !== null && _b$meta$capabilities !== void 0 && _b$meta$capabilities.didSpace) {
+      capabilities.didSpace = b.meta.capabilities.didSpace;
+    }
+  });
+  return capabilities;
+};
+
 /**
  * @param {object} blocklet
  * @param {{
@@ -156,7 +175,7 @@ const ensureDomainAliases = async function ensureDomainAliases(domainAliases) {
  *   getIP: function
  * }}
  */
-exports.ensureDomainAliases = ensureDomainAliases;
+exports.getAppCapabilities = getAppCapabilities;
 const fixBlocklet = async function fixBlocklet(blocklet) {
   let {
     fixRuntime = true,
@@ -209,5 +228,6 @@ const fixBlocklet = async function fixBlocklet(blocklet) {
   } else {
     blocklet.site.domainAliases = [];
   }
+  blocklet.capabilities = getAppCapabilities(blocklet);
 };
 exports.fixBlocklet = fixBlocklet;

package/lib/locales/en.js

@@ -459,6 +459,9 @@ module.exports = {
       star: 'Star'
     },
     component: {
+      didSpaceConfig: 'Configure DID Spaces',
+      didSpaceConfigTip: 'Complete the following authorize process to store application data in DID Spaces',
+      didSpaceConnected: 'Storage being authorized to: {endpoint}',
       checkUpdateTitle: 'Check for Updates',
       updateTitle: 'Update Components',
       noUpdate: 'No components to update',

package/lib/locales/zh.js

@@ -467,6 +467,9 @@ module.exports = {
       star: '收藏数'
     },
     component: {
+      didSpaceConfig: '配置 DID Spaces',
+      didSpaceConfigTip: '完成以下授权流程，即可将应用数据存储到 DID Spaces 中',
+      didSpaceConnected: '正在授权存储到：{endpoint}',
       checkUpdateTitle: '检查更新',
       updateTitle: '更新组件',
       noUpdate: '没有需要更新的组件',

package/lib/lost-passport.js

@@ -21,6 +21,7 @@ var _Avatar = _interopRequireDefault(require("@mui/material/Avatar"));
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Address = _interopRequireDefault(require("@arcblock/did-connect/lib/Address"));
 var _context = require("@arcblock/ux/lib/Locale/context");
+var _useBrowser = _interopRequireDefault(require("@arcblock/react-hooks/lib/useBrowser"));
 var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
 var _constant = require("@abtnode/constant");
 var _cardSelector = _interopRequireDefault(require("./card-selector"));
@@ -30,6 +31,15 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+const isFromWallet = () => {
+  const {
+    searchParams
+  } = new URL(window.location.href);
+  return searchParams.get('fromWallet') === '1';
+};
+
 // eslint-disable-next-line react/prop-types
 function ColorStepIcon(_ref) {
   let {
@@ -85,6 +95,9 @@ function LostPassport(_ref2) {
   const {
     setPassportId
   } = (0, _usePassportId.default)();
+  const {
+    wallet: isWalletWebview
+  } = (0, _useBrowser.default)();
 
   // eslint-disable-next-line no-undef
   const {
@@ -108,6 +121,12 @@ function LostPassport(_ref2) {
   };
   const onUsePassport = () => {
     var _window$env;
+    if (isWalletWebview && isFromWallet()) {
+      Promise.resolve().then(() => _interopRequireWildcard(require('dsbridge'))).then(jsBridge => {
+        jsBridge.call('arcClosePage');
+      });
+      return;
+    }
     try {
       session.logout();
     } catch (err) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.0-beta-b16cb035",
+  "version": "1.16.0-beta-1d6c582e",
   "description": "UX components shared across abtnode packages",
   "main": "lib/index.js",
   "files": [
@@ -21,19 +21,20 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@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",
+    "@abtnode/auth": "1.16.0-beta-1d6c582e",
+    "@abtnode/constant": "1.16.0-beta-1d6c582e",
+    "@abtnode/util": "1.16.0-beta-1d6c582e",
+    "@arcblock/did-connect": "^2.5.14",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.5.12",
-    "@arcblock/terminal": "^2.5.12",
-    "@arcblock/ux": "^2.5.12",
-    "@blocklet/constant": "1.16.0-beta-b16cb035",
+    "@arcblock/icons": "^2.5.14",
+    "@arcblock/react-hooks": "^2.5.14",
+    "@arcblock/terminal": "^2.5.14",
+    "@arcblock/ux": "^2.5.14",
+    "@blocklet/constant": "1.16.0-beta-1d6c582e",
     "@blocklet/launcher-layout": "1.9.65",
     "@blocklet/list": "^0.11.6",
-    "@blocklet/meta": "1.16.0-beta-b16cb035",
-    "@blocklet/ui-react": "^2.5.12",
+    "@blocklet/meta": "1.16.0-beta-1d6c582e",
+    "@blocklet/ui-react": "^2.5.14",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -47,6 +48,7 @@
     "axios": "^0.27.2",
     "classnames": "^2.3.2",
     "dayjs": "^1.11.7",
+    "dsbridge": "3.1.4",
     "file-saver": "^2.0.5",
     "filesize": "^6.4.0",
     "flat": "^5.0.2",
@@ -86,5 +88,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "138bd91aee5a35b28c2de4e1e924c44932efaf3a"
+  "gitHead": "209fa1413ae05d8961942b2c21f2d83df66f4b68"
 }