@abtnode/ux 1.16.17-beta-09df289d → 1.16.17-beta-d282d63e

package/es/blocklet/storage/connect-to.js

@@ -14,7 +14,7 @@ import { axios } from '../../util/api';
 import { formatError, getWebWalletUrl } from '../../util';
 import { useNodeContext } from '../../contexts/node';
 import useBlockletInfoForConnectDIDSpaces from '../../hooks/use-blocklet-info-for-connect-did-spaces';
-import { getDIDSpaceDidFromEndpoint, isValidSpaceGatewayUrl } from '../../util/spaces';
+import { extraDIDSpacesCoreUrl, getDIDSpaceDidFromEndpoint, isValidSpaceGatewayUrl } from '../../util/spaces';
 import { useBlockletStorageContext } from '../../contexts/blocklet-storage';
 /**
  * @description
@@ -121,6 +121,7 @@ function ConnectTo({
         ...preValue,
         open: false
       }));
+      setUrl(null);
       setAuthorizeFromNftConnect(preValue => ({
         ...preValue,
         open: false
@@ -190,7 +191,9 @@ function ConnectTo({
   const handleUseSpaceGatewayConnect = async () => {
     try {
       setLoading(true);
-      const fullUrl = url.startsWith('http') ? url : `https://${url}`;
+      const tempUrl = url.startsWith('http') ? url : `https://${url}`;
+      const fullUrl = extraDIDSpacesCoreUrl(tempUrl);
+      const spaceDid = new URL(tempUrl).searchParams.get('spaceDid');
       if (!(await isValidSpaceGatewayUrl(fullUrl))) {
         throw new Error(t('storage.spaces.gateway.add.invalidUrl'));
       }
@@ -209,7 +212,8 @@ function ConnectTo({
           scopes: blockletInfo.scopes,
           appUrl: blockletInfo.appUrl,
           referrer: blockletInfo.referrer,
-          nodeDid: info.did
+          nodeDid: info.did,
+          spaceDid
         }
       }));
       setOpen(false);

package/es/blocklet/storage/item.js

@@ -192,7 +192,8 @@ function SpaceItem({
         scopes,
         appUrl,
         referrer,
-        nodeDid
+        nodeDid,
+        spaceDid: spaceGateway.did
       }
     }));
   };

package/es/util/spaces.js

@@ -1,10 +1,10 @@
 import isUrl from 'is-url';
 import { BLOCKLET_CONFIGURABLE_KEY } from '@blocklet/constant';
 import { isObject } from 'lodash';
+import { joinURL } from 'ufo';
 import { api } from './api';
 
 /* eslint-disable import/prefer-default-export */
-const joinUrl = require('url-join');
 
 /**
  * @FIXME 希望之后放在 sdk 中 @jianchao
@@ -17,7 +17,7 @@ export function getBackupFilesUrlFromEndpoint(endpoint) {
   const strArray = endpoint.replace(/\/$/, '').split('/');
   const spaceDid = strArray.at(-4);
   const appDid = strArray.at(-2);
-  return joinUrl(prefix, 'space', spaceDid, 'apps', appDid, 'explorer', `?key=/apps/${appDid}/.did-objects/${appDid}/`);
+  return joinURL(prefix, 'space', spaceDid, 'apps', appDid, `explorer?key=/apps/${appDid}/.did-objects/${appDid}/`);
 }
 
 /**
@@ -30,7 +30,7 @@ export function getDIDSpaceUrlFromEndpoint(endpoint) {
   const prefix = endpoint.replace(/\/api\/space\/.+/, '');
   const strArray = endpoint.replace(/\/$/, '').split('/');
   const spaceDid = strArray.at(-4);
-  return joinUrl(prefix, 'space', spaceDid);
+  return joinURL(prefix, 'space', spaceDid);
 }
 
 /**
@@ -88,6 +88,19 @@ export function getSpaceGatewayFromEndpoint(endpoint) {
   return endpoint?.replace(/\/api\/space\/.+/, '');
 }
 
+/**
+ * @description
+ * @export
+ * @param {string} url
+ * @return {string}
+ */
+export function extraDIDSpacesCoreUrl(url) {
+  const Url = new URL(url);
+  // @note: 去除查询参数的那部分字符串
+  const didSpacesCoreUrl = joinURL(Url.origin, Url.pathname);
+  return didSpacesCoreUrl;
+}
+
 /**
  * @description
  * @export
@@ -99,7 +112,8 @@ export async function isValidSpaceGatewayUrl(spaceGatewayUrl) {
     if (!isUrl(spaceGatewayUrl)) {
       return false;
     }
-    const didConnectTokenUrl = joinUrl(spaceGatewayUrl, 'space/api/did/one-click-authorization/token');
+    const didSpacesCoreUrl = extraDIDSpacesCoreUrl(spaceGatewayUrl);
+    const didConnectTokenUrl = joinURL(didSpacesCoreUrl, 'space/api/did/one-click-authorization/token');
     const {
       status,
       data
@@ -147,7 +161,7 @@ export function getSpaceNftDisplayUrlFromEndpoint(endpoint) {
   const prefix = endpoint.replace(/\/api\/space\/.+/, '');
   const strArray = endpoint.replace(/\/$/, '').split('/');
   const spaceDid = strArray.at(-4);
-  return joinUrl(prefix, `/api/space/nft/display?spaceDid=${spaceDid}`);
+  return joinURL(prefix, `/api/space/nft/display?spaceDid=${spaceDid}`);
 }
 
 /**

package/lib/blocklet/storage/connect-to.js

@@ -126,6 +126,7 @@ function ConnectTo(_ref) {
       setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
         open: false
       }));
+      setUrl(null);
       setAuthorizeFromNftConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
         open: false
       }));
@@ -195,7 +196,9 @@ function ConnectTo(_ref) {
   const handleUseSpaceGatewayConnect = async () => {
     try {
       setLoading(true);
-      const fullUrl = url.startsWith('http') ? url : "https://".concat(url);
+      const tempUrl = url.startsWith('http') ? url : "https://".concat(url);
+      const fullUrl = (0, _spaces.extraDIDSpacesCoreUrl)(tempUrl);
+      const spaceDid = new URL(tempUrl).searchParams.get('spaceDid');
       if (!(await (0, _spaces.isValidSpaceGatewayUrl)(fullUrl))) {
         throw new Error(t('storage.spaces.gateway.add.invalidUrl'));
       }
@@ -213,7 +216,8 @@ function ConnectTo(_ref) {
           scopes: blockletInfo.scopes,
           appUrl: blockletInfo.appUrl,
           referrer: blockletInfo.referrer,
-          nodeDid: info.did
+          nodeDid: info.did,
+          spaceDid
         }
       }));
       setOpen(false);

package/lib/blocklet/storage/item.js

@@ -205,7 +205,8 @@ function SpaceItem(_ref) {
         scopes,
         appUrl,
         referrer,
-        nodeDid
+        nodeDid,
+        spaceDid: spaceGateway.did
       }
     }));
   };

package/lib/util/spaces.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.extraDIDSpacesCoreUrl = extraDIDSpacesCoreUrl;
 exports.getBackupFilesUrlFromEndpoint = getBackupFilesUrlFromEndpoint;
 exports.getDIDSpaceDidFromEndpoint = getDIDSpaceDidFromEndpoint;
 exports.getDIDSpaceEndpoint = void 0;
@@ -16,10 +17,10 @@ exports.isValidSpaceGatewayUrl = isValidSpaceGatewayUrl;
 var _isUrl = _interopRequireDefault(require("is-url"));
 var _constant = require("@blocklet/constant");
 var _lodash = require("lodash");
+var _ufo = require("ufo");
 var _api = require("./api");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /* eslint-disable import/prefer-default-export */
-const joinUrl = require('url-join');
 
 /**
  * @FIXME 希望之后放在 sdk 中 @jianchao
@@ -32,7 +33,7 @@ function getBackupFilesUrlFromEndpoint(endpoint) {
   const strArray = endpoint.replace(/\/$/, '').split('/');
   const spaceDid = strArray.at(-4);
   const appDid = strArray.at(-2);
-  return joinUrl(prefix, 'space', spaceDid, 'apps', appDid, 'explorer', "?key=/apps/".concat(appDid, "/.did-objects/").concat(appDid, "/"));
+  return (0, _ufo.joinURL)(prefix, 'space', spaceDid, 'apps', appDid, "explorer?key=/apps/".concat(appDid, "/.did-objects/").concat(appDid, "/"));
 }
 
 /**
@@ -45,7 +46,7 @@ function getDIDSpaceUrlFromEndpoint(endpoint) {
   const prefix = endpoint.replace(/\/api\/space\/.+/, '');
   const strArray = endpoint.replace(/\/$/, '').split('/');
   const spaceDid = strArray.at(-4);
-  return joinUrl(prefix, 'space', spaceDid);
+  return (0, _ufo.joinURL)(prefix, 'space', spaceDid);
 }
 
 /**
@@ -104,6 +105,19 @@ function getSpaceGatewayFromEndpoint(endpoint) {
   return endpoint === null || endpoint === void 0 ? void 0 : endpoint.replace(/\/api\/space\/.+/, '');
 }
 
+/**
+ * @description
+ * @export
+ * @param {string} url
+ * @return {string}
+ */
+function extraDIDSpacesCoreUrl(url) {
+  const Url = new URL(url);
+  // @note: 去除查询参数的那部分字符串
+  const didSpacesCoreUrl = (0, _ufo.joinURL)(Url.origin, Url.pathname);
+  return didSpacesCoreUrl;
+}
+
 /**
  * @description
  * @export
@@ -115,7 +129,8 @@ async function isValidSpaceGatewayUrl(spaceGatewayUrl) {
     if (!(0, _isUrl.default)(spaceGatewayUrl)) {
       return false;
     }
-    const didConnectTokenUrl = joinUrl(spaceGatewayUrl, 'space/api/did/one-click-authorization/token');
+    const didSpacesCoreUrl = extraDIDSpacesCoreUrl(spaceGatewayUrl);
+    const didConnectTokenUrl = (0, _ufo.joinURL)(didSpacesCoreUrl, 'space/api/did/one-click-authorization/token');
     const {
       status,
       data
@@ -163,7 +178,7 @@ function getSpaceNftDisplayUrlFromEndpoint(endpoint) {
   const prefix = endpoint.replace(/\/api\/space\/.+/, '');
   const strArray = endpoint.replace(/\/$/, '').split('/');
   const spaceDid = strArray.at(-4);
-  return joinUrl(prefix, "/api/space/nft/display?spaceDid=".concat(spaceDid));
+  return (0, _ufo.joinURL)(prefix, "/api/space/nft/display?spaceDid=".concat(spaceDid));
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.17-beta-09df289d",
+  "version": "1.16.17-beta-d282d63e",
   "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.17-beta-09df289d",
-    "@abtnode/constant": "1.16.17-beta-09df289d",
-    "@abtnode/util": "1.16.17-beta-09df289d",
+    "@abtnode/auth": "1.16.17-beta-d282d63e",
+    "@abtnode/constant": "1.16.17-beta-d282d63e",
+    "@abtnode/util": "1.16.17-beta-d282d63e",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.91",
     "@arcblock/did-connect": "^2.7.25",
@@ -39,10 +39,10 @@
     "@arcblock/react-hooks": "^2.7.25",
     "@arcblock/terminal": "^2.7.25",
     "@arcblock/ux": "^2.7.25",
-    "@blocklet/constant": "1.16.17-beta-09df289d",
+    "@blocklet/constant": "1.16.17-beta-d282d63e",
     "@blocklet/launcher-layout": "2.2.19",
     "@blocklet/list": "^0.12.45",
-    "@blocklet/meta": "1.16.17-beta-09df289d",
+    "@blocklet/meta": "1.16.17-beta-d282d63e",
     "@blocklet/ui-react": "^2.7.25",
     "@blocklet/uploader": "^0.0.24",
     "@emotion/react": "^11.10.4",
@@ -100,7 +100,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "e86da424c87029c447e4900fc5b6d91a287ebbae",
+  "gitHead": "b675be55d76903e8b92d98cfca7d960fcfedd98f",
   "exports": {
     ".": {
       "import": "./es/index.js",