@blocklet/did-space-react 0.5.76 → 0.5.78

package/dist/cjs/components/preview-space-nft/index.js

@@ -17,7 +17,7 @@ function PreviewSpaceNft({
   const handleClose = () => setOpen(false);
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
     /* @__PURE__ */ jsxRuntime.jsxs("div", { style: { position: "relative" }, onClick: handleOpen, children: [
-      /* @__PURE__ */ jsxRuntime.jsx("object", { data: src, width, height, children: /* @__PURE__ */ jsxRuntime.jsx(emptySpaceNft, { viewBox: "0 0 228 258", style: { cursor: "pointer", width: "64px", height: "64px" } }) }),
+      /* @__PURE__ */ jsxRuntime.jsx("object", { data: src, width, height, children: /* @__PURE__ */ jsxRuntime.jsx(emptySpaceNft, { viewBox: "0 0 228 258", style: { cursor: "pointer", width, height } }) }),
       /* @__PURE__ */ jsxRuntime.jsx(
         "div",
         {

package/dist/cjs/components/space-card/index.js

@@ -10,6 +10,8 @@ const Theme = require('@arcblock/ux/lib/Theme');
 const React = require('react');
 const axios = require('axios');
 const ahooks = require('ahooks');
+const compareVersions = require('compare-versions');
+const _package = require('../../package.json.js');
 const constants = require('../../libs/constants.js');
 const useMobile = require('../../hooks/use-mobile.js');
 const useSpaceInfo = require('../../hooks/use-space-info.js');
@@ -22,6 +24,7 @@ const spaceConnected = require('../../icons/space-connected.svg.js');
 const spaceDisconnect = require('../../icons/space-disconnect.svg.js');
 const spaceConnectError = require('../../icons/space-connect-error.svg.js');
 
+const expectVersion = `^${_package.version}`;
 function Status({
   spaceUrl,
   status,
@@ -84,6 +87,17 @@ function Status({
       [constants.SPACE_CONNECT_ERROR_CODE.CORS_BLOCKED]: {
         icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle }),
         text: /* @__PURE__ */ jsxRuntime.jsx(ErrorLink, { title: t("storage.spaces.error.corsBlocked"), url: ufo.withQuery(constants.fixCorsErrorPageUrl, { locale }) })
+      },
+      // Space 版本不兼容
+      [constants.SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE]: {
+        icon: /* @__PURE__ */ jsxRuntime.jsx(spaceConnectError, { style: iconStyle }),
+        text: /* @__PURE__ */ jsxRuntime.jsx(
+          ErrorLink,
+          {
+            title: t("storage.spaces.error.incompatible"),
+            url: ufo.joinURL(new URL(spaceUrl).origin, ".well-known/service/admin/components")
+          }
+        )
       }
     }),
     [locale]
@@ -140,8 +154,8 @@ function SpaceCard({ endpoint, selected = false, compat, action, className, deps
   if (isUndefined(isCompact)) {
     isCompact = isMobile;
   }
-  const spaceDid = util.getDIDSpaceDidFromEndpoint(endpoint);
-  const spaceUrl = util.getDIDSpaceUrlFromEndpoint(endpoint);
+  const spaceDid = util.getSpaceDidFromEndpoint(endpoint);
+  const spaceUrl = util.getSpaceUrlFromEndpoint(endpoint);
   const gatewayUrl = util.getSpaceGatewayUrlFromEndpoint(endpoint);
   const [refreshSpaceInfo, setRefreshSpaceInfo] = React.useState(false);
   const refresh = () => setRefreshSpaceInfo((p) => !p);
@@ -161,8 +175,13 @@ function SpaceCard({ endpoint, selected = false, compat, action, className, deps
     spaceStatus.current = index.SpaceStatus.LOADING;
     spaceName = /* @__PURE__ */ jsxRuntime.jsx(material.Skeleton, { variant: "text", sx: { width: "180px", fontSize: "1rem" } });
   } else if (spaceInfo) {
-    spaceName = spaceInfo.spaceName;
-    if (!isAvailable) {
+    spaceName = spaceInfo.name;
+    const spaceVersion = spaceInfo.version;
+    const isIncompatible = !spaceVersion || !compareVersions.satisfies(spaceVersion, expectVersion);
+    if (isIncompatible) {
+      spaceStatus.current = index.SpaceStatus.UNAVAILABLE;
+      errorCode = constants.SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE;
+    } else if (!isAvailable) {
       spaceStatus.current = index.SpaceStatus.UNAVAILABLE;
       errorCode = spaceInfo.errorCode;
       if (errorCode === constants.SPACE_CONNECT_ERROR_CODE.UNAUTHORIZED) {
@@ -187,7 +206,7 @@ function SpaceCard({ endpoint, selected = false, compat, action, className, deps
       return action({
         spaceGateway: {
           did: spaceDid,
-          name: spaceInfo?.spaceName ?? "",
+          name: spaceInfo?.name ?? "",
           url: gatewayUrl,
           endpoint,
           ownerDid: spaceInfo?.ownerDid ?? ""

package/dist/cjs/hooks/use-space-info.d.ts

@@ -1,11 +1,13 @@
+type SpaceInfo = {
+    version: string;
+    name: string;
+    subscriptionId: string;
+    ownerDid: string;
+    isAvailable: boolean;
+    errorCode: number;
+};
 export default function useSpaceInfo({ endpoint, deps }: {
     endpoint: string;
     deps?: any[];
-}): import("ahooks/lib/useRequest/src/types").Result<{
-    spaceName: string;
-    subscriptionId: any;
-    ownerDid: any;
-    isAvailable: boolean;
-    errorMessage: string;
-    errorCode: number;
-} | undefined, []>;
+}): import("ahooks/lib/useRequest/src/types").Result<SpaceInfo | undefined, any[]>;
+export {};

package/dist/cjs/hooks/use-space-info.js

@@ -2,6 +2,7 @@
 
 const isUrl = require('is-url');
 const ahooks = require('ahooks');
+const constants = require('../libs/constants.js');
 const api = require('../libs/api.js');
 
 function useSpaceInfo({ endpoint, deps = [] }) {
@@ -16,14 +17,47 @@ function useSpaceInfo({ endpoint, deps = [] }) {
           withExtras: true
         }
       });
-      const spaceName = headers["x-space-name"];
+      const [
+        rawName,
+        rawSubscriptionId,
+        isListable,
+        isReadable,
+        isWriteable,
+        rawVersion,
+        rawOwnerDid,
+        rawAvailable,
+        rawErrorCode
+      ] = [
+        headers["x-space-name"],
+        headers["x-subscription-id"],
+        headers["x-listable"] === "true",
+        headers["x-readable"] === "true",
+        headers["x-writeable"] === "true",
+        // 新版 headers
+        headers["x-space-version"],
+        headers["x-space-owner-did"],
+        headers["x-space-is-available"],
+        headers["x-error-code"]
+      ];
+      const name = rawName ? decodeURIComponent(rawName) : "";
+      if (rawAvailable === void 0 || rawErrorCode === void 0) {
+        const isAvailable = isListable && isReadable && isWriteable;
+        return {
+          version: rawVersion || "",
+          name,
+          subscriptionId: rawSubscriptionId,
+          ownerDid: rawOwnerDid || "",
+          isAvailable,
+          errorCode: isAvailable ? 0 : constants.SPACE_CONNECT_ERROR_CODE.UNAUTHORIZED
+        };
+      }
       return {
-        spaceName: spaceName ? decodeURIComponent(spaceName) : "",
-        subscriptionId: headers["x-subscription-id"],
-        ownerDid: headers["x-space-owner-did"],
-        isAvailable: headers["x-space-is-available"] === "true",
-        errorMessage: decodeURIComponent(headers["x-error-message"]),
-        errorCode: parseInt(headers["x-error-code"], 10)
+        version: rawVersion || "",
+        name,
+        subscriptionId: rawSubscriptionId,
+        ownerDid: rawOwnerDid,
+        isAvailable: rawAvailable === "true",
+        errorCode: parseInt(rawErrorCode, 10)
       };
     },
     {

package/dist/cjs/index.js

@@ -41,12 +41,11 @@ exports.fixCorsErrorPageUrl = constants.fixCorsErrorPageUrl;
 exports.classNames = util.classNames;
 exports.decryptSpaceGateway = util.decryptSpaceGateway;
 exports.extraDIDSpacesCoreUrl = util.extraDIDSpacesCoreUrl;
-exports.getDIDSpaceDidFromEndpoint = util.getDIDSpaceDidFromEndpoint;
-exports.getDIDSpaceUrlFromEndpoint = util.getDIDSpaceUrlFromEndpoint;
 exports.getSpaceDidFromEndpoint = util.getSpaceDidFromEndpoint;
 exports.getSpaceDidFromSpaceUrl = util.getSpaceDidFromSpaceUrl;
 exports.getSpaceGatewayUrlFromEndpoint = util.getSpaceGatewayUrlFromEndpoint;
 exports.getSpaceNftDisplayUrlFromEndpoint = util.getSpaceNftDisplayUrlFromEndpoint;
+exports.getSpaceUrlFromEndpoint = util.getSpaceUrlFromEndpoint;
 exports.isCorsBlockedError = util.isCorsBlockedError;
 exports.t = util.t;
 exports.getSpaceGatewayUrl = gateway.getSpaceGatewayUrl;

package/dist/cjs/libs/constants.d.ts

@@ -13,6 +13,8 @@ export declare const SPACE_CONNECT_ERROR_CODE: {
     UNIT_LIMIT: number;
     /** 跨域限制 */
     CORS_BLOCKED: number;
+    /** Space 版本不兼容 */
+    INCOMPATIBLE: number;
 };
 export declare const AUTHORIZE: {
     DEFAULT_SCOPE: string;

package/dist/cjs/libs/constants.js

@@ -14,7 +14,9 @@ const SPACE_CONNECT_ERROR_CODE = {
   /** 用量不足 */
   UNIT_LIMIT: 1006,
   /** 跨域限制 */
-  CORS_BLOCKED: 1007
+  CORS_BLOCKED: 1007,
+  /** Space 版本不兼容 */
+  INCOMPATIBLE: 1008
 };
 const AUTHORIZE = {
   DEFAULT_SCOPE: "list:object read:object write:object"

package/dist/cjs/libs/util.d.ts

@@ -11,10 +11,9 @@ type ClassStr = string | undefined | null;
  * classNames(['foo', 'bar']); // => 'foo bar'
  */
 export declare function classNames(...classes: (ClassStr | Record<string, boolean> | Array<ClassStr | Record<string, boolean>>)[]): string;
-export declare function getDIDSpaceDidFromEndpoint(endpoint: string): string | undefined;
-export declare function getDIDSpaceUrlFromEndpoint(endpoint: string): string;
-export declare function getSpaceNftDisplayUrlFromEndpoint(endpoint: string): string;
 export declare function getSpaceDidFromEndpoint(endpoint: string): string | undefined;
+export declare function getSpaceUrlFromEndpoint(endpoint: string): string;
+export declare function getSpaceNftDisplayUrlFromEndpoint(endpoint: string): string;
 export declare function getSpaceGatewayUrlFromEndpoint(endpoint: string): string;
 export declare function extraDIDSpacesCoreUrl(url: string): string;
 export declare function getSpaceDidFromSpaceUrl(url: string): string | undefined;

package/dist/cjs/libs/util.js

@@ -24,12 +24,12 @@ function classNames(...classes) {
   });
   return result.join(" ");
 }
-function getDIDSpaceDidFromEndpoint(endpoint) {
+function getSpaceDidFromEndpoint(endpoint) {
   const strArray = endpoint.replace(/\/$/, "").split("/");
   const spaceDid = strArray.at(-4);
   return spaceDid;
 }
-function getDIDSpaceUrlFromEndpoint(endpoint) {
+function getSpaceUrlFromEndpoint(endpoint) {
   const prefix = endpoint.replace(/\/api\/space\/.+/, "");
   const strArray = endpoint.replace(/\/$/, "").split("/");
   const spaceDid = strArray.at(-4);
@@ -41,13 +41,8 @@ function getSpaceNftDisplayUrlFromEndpoint(endpoint) {
   const spaceDid = strArray.at(-4);
   return ufo.joinURL(prefix, `/api/space/nft/display?spaceDid=${spaceDid}`);
 }
-function getSpaceDidFromEndpoint(endpoint) {
-  const strArray = endpoint.replace(/\/$/, "").split("/");
-  const spaceDid = strArray.at(-4);
-  return spaceDid;
-}
 function getSpaceGatewayUrlFromEndpoint(endpoint) {
-  const spaceUrl = getDIDSpaceUrlFromEndpoint(endpoint);
+  const spaceUrl = getSpaceUrlFromEndpoint(endpoint);
   return spaceUrl.split("/space/")[0];
 }
 function extraDIDSpacesCoreUrl(url) {
@@ -87,11 +82,10 @@ function t(key, localeOrData, data = {}) {
 exports.classNames = classNames;
 exports.decryptSpaceGateway = decryptSpaceGateway;
 exports.extraDIDSpacesCoreUrl = extraDIDSpacesCoreUrl;
-exports.getDIDSpaceDidFromEndpoint = getDIDSpaceDidFromEndpoint;
-exports.getDIDSpaceUrlFromEndpoint = getDIDSpaceUrlFromEndpoint;
 exports.getSpaceDidFromEndpoint = getSpaceDidFromEndpoint;
 exports.getSpaceDidFromSpaceUrl = getSpaceDidFromSpaceUrl;
 exports.getSpaceGatewayUrlFromEndpoint = getSpaceGatewayUrlFromEndpoint;
 exports.getSpaceNftDisplayUrlFromEndpoint = getSpaceNftDisplayUrlFromEndpoint;
+exports.getSpaceUrlFromEndpoint = getSpaceUrlFromEndpoint;
 exports.isCorsBlockedError = isCorsBlockedError;
 exports.t = t;

package/dist/cjs/locales/en.js

@@ -10,7 +10,8 @@ const en = flat.flatten({
     error: "Error",
     open: "Open",
     unknown: "Unknown",
-    invalidUrl: "Invalid url: {url}"
+    invalidUrl: "Invalid url: {url}",
+    upgrade: "Upgrade"
   },
   storage: {
     spaces: {
@@ -40,7 +41,8 @@ const en = flat.flatten({
         invalid: "DID Spaces subscription anomaly, click this link to check",
         unitLimit: "DID Spaces free quota has been used up, click this link to pay for the upgrade",
         corsBlocked: "The connection request may fail due to CORS restrictions:\n1. Please contact the DID Space administrator to verify the relevant configuration.\n2. If you are the administrator, click the link below to view the detailed setup guide and resolve the issue.",
-        networkError: "Network error"
+        networkError: "Network error",
+        incompatible: "The current DID Spaces version is incompatible. Please contact your administrator to make adjustments. \nIf you are the administrator, click the link below to proceed."
       },
       gateway: {
         add: {

package/dist/cjs/locales/zh.js

@@ -10,7 +10,8 @@ const zh = flat.flatten({
     error: "\u9519\u8BEF",
     open: "\u6253\u5F00",
     unknown: "\u672A\u77E5",
-    invalidUrl: "\u65E0\u6548\u7684 url: {url}"
+    invalidUrl: "\u65E0\u6548\u7684 url: {url}",
+    upgrade: "\u5347\u7EA7"
   },
   storage: {
     spaces: {
@@ -40,7 +41,8 @@ const zh = flat.flatten({
         invalid: "DID Spaces \u8BA2\u9605\u5F02\u5E38\uFF0C\u70B9\u51FB\u6B64\u94FE\u63A5\u68C0\u67E5",
         unitLimit: "DID Spaces \u514D\u8D39\u989D\u5EA6\u5DF2\u7528\u5B8C\uFF0C\u70B9\u51FB\u6B64\u94FE\u63A5\u4ED8\u8D39\u5347\u7EA7",
         corsBlocked: "\u8FDE\u63A5\u8BF7\u6C42\u53EF\u80FD\u56E0 CORS \u9650\u5236\u800C\u5931\u8D25\uFF1A\n1. \u8BF7\u8054\u7CFB DID Space \u7BA1\u7406\u5458\u786E\u8BA4\u76F8\u5173\u914D\u7F6E\u662F\u5426\u6B63\u786E\u3002\n2. \u5982\u679C\u60A8\u662F\u7BA1\u7406\u5458\uFF0C\u53EF\u4EE5\u70B9\u51FB\u4E0B\u65B9\u94FE\u63A5\uFF0C\u67E5\u770B\u8BE6\u7EC6\u7684\u914D\u7F6E\u6307\u5357\u5E76\u89E3\u51B3\u95EE\u9898\u3002",
-        networkError: "\u7F51\u7EDC\u9519\u8BEF"
+        networkError: "\u7F51\u7EDC\u9519\u8BEF",
+        incompatible: "\u5F53\u524D DID Spaces \u7248\u672C\u4E0D\u517C\u5BB9\u3002\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u8FDB\u884C\u8C03\u6574\u3002\n\u5982\u679C\u60A8\u662F\u7BA1\u7406\u5458\uFF0C\u53EF\u4EE5\u5355\u51FB\u4E0B\u9762\u7684\u94FE\u63A5\u8FDB\u884C\u64CD\u4F5C\u3002"
       },
       gateway: {
         add: {
@@ -53,6 +55,9 @@ const zh = flat.flatten({
         title: "\u8BF7\u4E3A {appName} \u51FA\u793A DID Spaces NFT",
         scan: "\u4F7F\u7528\u4F60\u7684 DID Wallet \u626B\u63CF\u4E0B\u9762\u7684\u4E8C\u7EF4\u7801\u4E3A\u5E94\u7528 {appName} \u51FA\u793A DID Spaces NFT",
         success: "\u8FDE\u63A5\u6210\u529F"
+      },
+      helperText: {
+        fixCorsError: "\u4FEE\u590D\u8FDE\u63A5 DID Spaces \u65F6\u7684 CORS \u9519\u8BEF"
       }
     }
   }

package/dist/cjs/package.json.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const version = "0.5.78";
+
+exports.version = version;

package/dist/es/components/preview-space-nft/index.js

@@ -15,7 +15,7 @@ function PreviewSpaceNft({
   const handleClose = () => setOpen(false);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsxs("div", { style: { position: "relative" }, onClick: handleOpen, children: [
-      /* @__PURE__ */ jsx("object", { data: src, width, height, children: /* @__PURE__ */ jsx(SvgEmptySpaceNft, { viewBox: "0 0 228 258", style: { cursor: "pointer", width: "64px", height: "64px" } }) }),
+      /* @__PURE__ */ jsx("object", { data: src, width, height, children: /* @__PURE__ */ jsx(SvgEmptySpaceNft, { viewBox: "0 0 228 258", style: { cursor: "pointer", width, height } }) }),
       /* @__PURE__ */ jsx(
         "div",
         {

package/dist/es/components/space-card/index.js

@@ -8,11 +8,13 @@ import { styled } from '@arcblock/ux/lib/Theme';
 import { useState, useRef, useEffect } from 'react';
 import { AxiosError } from 'axios';
 import { useCreation } from 'ahooks';
+import { satisfies } from 'compare-versions';
+import { version } from '../../package.json.js';
 import { SPACE_CONNECT_ERROR_CODE, fixCorsErrorPageUrl } from '../../libs/constants.js';
 import useMobile from '../../hooks/use-mobile.js';
 import useSpaceInfo from '../../hooks/use-space-info.js';
 import useLocale from '../../hooks/use-locale.js';
-import { getDIDSpaceDidFromEndpoint, getDIDSpaceUrlFromEndpoint, getSpaceGatewayUrlFromEndpoint, isCorsBlockedError, classNames, getSpaceNftDisplayUrlFromEndpoint } from '../../libs/util.js';
+import { getSpaceDidFromEndpoint, getSpaceUrlFromEndpoint, getSpaceGatewayUrlFromEndpoint, isCorsBlockedError, classNames, getSpaceNftDisplayUrlFromEndpoint } from '../../libs/util.js';
 import { SpaceStatus } from '../../types/index.js';
 import '../../icons/index.js';
 import { PreviewSpaceNft } from '../preview-space-nft/index.js';
@@ -20,6 +22,7 @@ import SvgSpaceConnected from '../../icons/space-connected.svg.js';
 import SvgSpaceDisconnect from '../../icons/space-disconnect.svg.js';
 import SvgSpaceConnectError from '../../icons/space-connect-error.svg.js';
 
+const expectVersion = `^${version}`;
 function Status({
   spaceUrl,
   status,
@@ -82,6 +85,17 @@ function Status({
       [SPACE_CONNECT_ERROR_CODE.CORS_BLOCKED]: {
         icon: /* @__PURE__ */ jsx(SvgSpaceConnectError, { style: iconStyle }),
         text: /* @__PURE__ */ jsx(ErrorLink, { title: t("storage.spaces.error.corsBlocked"), url: withQuery(fixCorsErrorPageUrl, { locale }) })
+      },
+      // Space 版本不兼容
+      [SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE]: {
+        icon: /* @__PURE__ */ jsx(SvgSpaceConnectError, { style: iconStyle }),
+        text: /* @__PURE__ */ jsx(
+          ErrorLink,
+          {
+            title: t("storage.spaces.error.incompatible"),
+            url: joinURL(new URL(spaceUrl).origin, ".well-known/service/admin/components")
+          }
+        )
       }
     }),
     [locale]
@@ -138,8 +152,8 @@ function SpaceCard({ endpoint, selected = false, compat, action, className, deps
   if (isUndefined(isCompact)) {
     isCompact = isMobile;
   }
-  const spaceDid = getDIDSpaceDidFromEndpoint(endpoint);
-  const spaceUrl = getDIDSpaceUrlFromEndpoint(endpoint);
+  const spaceDid = getSpaceDidFromEndpoint(endpoint);
+  const spaceUrl = getSpaceUrlFromEndpoint(endpoint);
   const gatewayUrl = getSpaceGatewayUrlFromEndpoint(endpoint);
   const [refreshSpaceInfo, setRefreshSpaceInfo] = useState(false);
   const refresh = () => setRefreshSpaceInfo((p) => !p);
@@ -159,8 +173,13 @@ function SpaceCard({ endpoint, selected = false, compat, action, className, deps
     spaceStatus.current = SpaceStatus.LOADING;
     spaceName = /* @__PURE__ */ jsx(Skeleton, { variant: "text", sx: { width: "180px", fontSize: "1rem" } });
   } else if (spaceInfo) {
-    spaceName = spaceInfo.spaceName;
-    if (!isAvailable) {
+    spaceName = spaceInfo.name;
+    const spaceVersion = spaceInfo.version;
+    const isIncompatible = !spaceVersion || !satisfies(spaceVersion, expectVersion);
+    if (isIncompatible) {
+      spaceStatus.current = SpaceStatus.UNAVAILABLE;
+      errorCode = SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE;
+    } else if (!isAvailable) {
       spaceStatus.current = SpaceStatus.UNAVAILABLE;
       errorCode = spaceInfo.errorCode;
       if (errorCode === SPACE_CONNECT_ERROR_CODE.UNAUTHORIZED) {
@@ -185,7 +204,7 @@ function SpaceCard({ endpoint, selected = false, compat, action, className, deps
       return action({
         spaceGateway: {
           did: spaceDid,
-          name: spaceInfo?.spaceName ?? "",
+          name: spaceInfo?.name ?? "",
           url: gatewayUrl,
           endpoint,
           ownerDid: spaceInfo?.ownerDid ?? ""

package/dist/es/hooks/use-space-info.d.ts

@@ -1,11 +1,13 @@
+type SpaceInfo = {
+    version: string;
+    name: string;
+    subscriptionId: string;
+    ownerDid: string;
+    isAvailable: boolean;
+    errorCode: number;
+};
 export default function useSpaceInfo({ endpoint, deps }: {
     endpoint: string;
     deps?: any[];
-}): import("ahooks/lib/useRequest/src/types").Result<{
-    spaceName: string;
-    subscriptionId: any;
-    ownerDid: any;
-    isAvailable: boolean;
-    errorMessage: string;
-    errorCode: number;
-} | undefined, []>;
+}): import("ahooks/lib/useRequest/src/types").Result<SpaceInfo | undefined, any[]>;
+export {};

package/dist/es/hooks/use-space-info.js

@@ -1,5 +1,6 @@
 import isUrl from 'is-url';
 import { useRequest } from 'ahooks';
+import { SPACE_CONNECT_ERROR_CODE } from '../libs/constants.js';
 import api from '../libs/api.js';
 
 function useSpaceInfo({ endpoint, deps = [] }) {
@@ -14,14 +15,47 @@ function useSpaceInfo({ endpoint, deps = [] }) {
           withExtras: true
         }
       });
-      const spaceName = headers["x-space-name"];
+      const [
+        rawName,
+        rawSubscriptionId,
+        isListable,
+        isReadable,
+        isWriteable,
+        rawVersion,
+        rawOwnerDid,
+        rawAvailable,
+        rawErrorCode
+      ] = [
+        headers["x-space-name"],
+        headers["x-subscription-id"],
+        headers["x-listable"] === "true",
+        headers["x-readable"] === "true",
+        headers["x-writeable"] === "true",
+        // 新版 headers
+        headers["x-space-version"],
+        headers["x-space-owner-did"],
+        headers["x-space-is-available"],
+        headers["x-error-code"]
+      ];
+      const name = rawName ? decodeURIComponent(rawName) : "";
+      if (rawAvailable === void 0 || rawErrorCode === void 0) {
+        const isAvailable = isListable && isReadable && isWriteable;
+        return {
+          version: rawVersion || "",
+          name,
+          subscriptionId: rawSubscriptionId,
+          ownerDid: rawOwnerDid || "",
+          isAvailable,
+          errorCode: isAvailable ? 0 : SPACE_CONNECT_ERROR_CODE.UNAUTHORIZED
+        };
+      }
       return {
-        spaceName: spaceName ? decodeURIComponent(spaceName) : "",
-        subscriptionId: headers["x-subscription-id"],
-        ownerDid: headers["x-space-owner-did"],
-        isAvailable: headers["x-space-is-available"] === "true",
-        errorMessage: decodeURIComponent(headers["x-error-message"]),
-        errorCode: parseInt(headers["x-error-code"], 10)
+        version: rawVersion || "",
+        name,
+        subscriptionId: rawSubscriptionId,
+        ownerDid: rawOwnerDid,
+        isAvailable: rawAvailable === "true",
+        errorCode: parseInt(rawErrorCode, 10)
       };
     },
     {

package/dist/es/index.js

@@ -8,7 +8,7 @@ export { BaseConnectTo } from './components/base-connect-to/index.js';
 export { AuthConnectTo } from './components/auth-connect-to/index.js';
 export { SessionConnectTo } from './components/session-connect-to/index.js';
 export { AUTHORIZE, SPACE_CONNECT_ERROR_CODE, copyGatewayPageUrl, fixCorsErrorPageUrl } from './libs/constants.js';
-export { classNames, decryptSpaceGateway, extraDIDSpacesCoreUrl, getDIDSpaceDidFromEndpoint, getDIDSpaceUrlFromEndpoint, getSpaceDidFromEndpoint, getSpaceDidFromSpaceUrl, getSpaceGatewayUrlFromEndpoint, getSpaceNftDisplayUrlFromEndpoint, isCorsBlockedError, t } from './libs/util.js';
+export { classNames, decryptSpaceGateway, extraDIDSpacesCoreUrl, getSpaceDidFromEndpoint, getSpaceDidFromSpaceUrl, getSpaceGatewayUrlFromEndpoint, getSpaceNftDisplayUrlFromEndpoint, getSpaceUrlFromEndpoint, isCorsBlockedError, t } from './libs/util.js';
 export { getSpaceGatewayUrl, verifySpaceUrl } from './libs/gateway.js';
 export { translations } from './locales/index.js';
 export { SpaceStatus } from './types/index.js';

package/dist/es/libs/constants.d.ts

@@ -13,6 +13,8 @@ export declare const SPACE_CONNECT_ERROR_CODE: {
     UNIT_LIMIT: number;
     /** 跨域限制 */
     CORS_BLOCKED: number;
+    /** Space 版本不兼容 */
+    INCOMPATIBLE: number;
 };
 export declare const AUTHORIZE: {
     DEFAULT_SCOPE: string;

package/dist/es/libs/constants.js

@@ -12,7 +12,9 @@ const SPACE_CONNECT_ERROR_CODE = {
   /** 用量不足 */
   UNIT_LIMIT: 1006,
   /** 跨域限制 */
-  CORS_BLOCKED: 1007
+  CORS_BLOCKED: 1007,
+  /** Space 版本不兼容 */
+  INCOMPATIBLE: 1008
 };
 const AUTHORIZE = {
   DEFAULT_SCOPE: "list:object read:object write:object"

package/dist/es/libs/util.d.ts

@@ -11,10 +11,9 @@ type ClassStr = string | undefined | null;
  * classNames(['foo', 'bar']); // => 'foo bar'
  */
 export declare function classNames(...classes: (ClassStr | Record<string, boolean> | Array<ClassStr | Record<string, boolean>>)[]): string;
-export declare function getDIDSpaceDidFromEndpoint(endpoint: string): string | undefined;
-export declare function getDIDSpaceUrlFromEndpoint(endpoint: string): string;
-export declare function getSpaceNftDisplayUrlFromEndpoint(endpoint: string): string;
 export declare function getSpaceDidFromEndpoint(endpoint: string): string | undefined;
+export declare function getSpaceUrlFromEndpoint(endpoint: string): string;
+export declare function getSpaceNftDisplayUrlFromEndpoint(endpoint: string): string;
 export declare function getSpaceGatewayUrlFromEndpoint(endpoint: string): string;
 export declare function extraDIDSpacesCoreUrl(url: string): string;
 export declare function getSpaceDidFromSpaceUrl(url: string): string | undefined;

package/dist/es/libs/util.js

@@ -22,12 +22,12 @@ function classNames(...classes) {
   });
   return result.join(" ");
 }
-function getDIDSpaceDidFromEndpoint(endpoint) {
+function getSpaceDidFromEndpoint(endpoint) {
   const strArray = endpoint.replace(/\/$/, "").split("/");
   const spaceDid = strArray.at(-4);
   return spaceDid;
 }
-function getDIDSpaceUrlFromEndpoint(endpoint) {
+function getSpaceUrlFromEndpoint(endpoint) {
   const prefix = endpoint.replace(/\/api\/space\/.+/, "");
   const strArray = endpoint.replace(/\/$/, "").split("/");
   const spaceDid = strArray.at(-4);
@@ -39,13 +39,8 @@ function getSpaceNftDisplayUrlFromEndpoint(endpoint) {
   const spaceDid = strArray.at(-4);
   return joinURL(prefix, `/api/space/nft/display?spaceDid=${spaceDid}`);
 }
-function getSpaceDidFromEndpoint(endpoint) {
-  const strArray = endpoint.replace(/\/$/, "").split("/");
-  const spaceDid = strArray.at(-4);
-  return spaceDid;
-}
 function getSpaceGatewayUrlFromEndpoint(endpoint) {
-  const spaceUrl = getDIDSpaceUrlFromEndpoint(endpoint);
+  const spaceUrl = getSpaceUrlFromEndpoint(endpoint);
   return spaceUrl.split("/space/")[0];
 }
 function extraDIDSpacesCoreUrl(url) {
@@ -82,4 +77,4 @@ function t(key, localeOrData, data = {}) {
   return translate(translations, key, locale, "en", finalData);
 }
 
-export { classNames, decryptSpaceGateway, extraDIDSpacesCoreUrl, getDIDSpaceDidFromEndpoint, getDIDSpaceUrlFromEndpoint, getSpaceDidFromEndpoint, getSpaceDidFromSpaceUrl, getSpaceGatewayUrlFromEndpoint, getSpaceNftDisplayUrlFromEndpoint, isCorsBlockedError, t };
+export { classNames, decryptSpaceGateway, extraDIDSpacesCoreUrl, getSpaceDidFromEndpoint, getSpaceDidFromSpaceUrl, getSpaceGatewayUrlFromEndpoint, getSpaceNftDisplayUrlFromEndpoint, getSpaceUrlFromEndpoint, isCorsBlockedError, t };

package/dist/es/locales/en.js

@@ -8,7 +8,8 @@ const en = flatten({
     error: "Error",
     open: "Open",
     unknown: "Unknown",
-    invalidUrl: "Invalid url: {url}"
+    invalidUrl: "Invalid url: {url}",
+    upgrade: "Upgrade"
   },
   storage: {
     spaces: {
@@ -38,7 +39,8 @@ const en = flatten({
         invalid: "DID Spaces subscription anomaly, click this link to check",
         unitLimit: "DID Spaces free quota has been used up, click this link to pay for the upgrade",
         corsBlocked: "The connection request may fail due to CORS restrictions:\n1. Please contact the DID Space administrator to verify the relevant configuration.\n2. If you are the administrator, click the link below to view the detailed setup guide and resolve the issue.",
-        networkError: "Network error"
+        networkError: "Network error",
+        incompatible: "The current DID Spaces version is incompatible. Please contact your administrator to make adjustments. \nIf you are the administrator, click the link below to proceed."
       },
       gateway: {
         add: {

package/dist/es/locales/zh.js

@@ -8,7 +8,8 @@ const zh = flatten({
     error: "\u9519\u8BEF",
     open: "\u6253\u5F00",
     unknown: "\u672A\u77E5",
-    invalidUrl: "\u65E0\u6548\u7684 url: {url}"
+    invalidUrl: "\u65E0\u6548\u7684 url: {url}",
+    upgrade: "\u5347\u7EA7"
   },
   storage: {
     spaces: {
@@ -38,7 +39,8 @@ const zh = flatten({
         invalid: "DID Spaces \u8BA2\u9605\u5F02\u5E38\uFF0C\u70B9\u51FB\u6B64\u94FE\u63A5\u68C0\u67E5",
         unitLimit: "DID Spaces \u514D\u8D39\u989D\u5EA6\u5DF2\u7528\u5B8C\uFF0C\u70B9\u51FB\u6B64\u94FE\u63A5\u4ED8\u8D39\u5347\u7EA7",
         corsBlocked: "\u8FDE\u63A5\u8BF7\u6C42\u53EF\u80FD\u56E0 CORS \u9650\u5236\u800C\u5931\u8D25\uFF1A\n1. \u8BF7\u8054\u7CFB DID Space \u7BA1\u7406\u5458\u786E\u8BA4\u76F8\u5173\u914D\u7F6E\u662F\u5426\u6B63\u786E\u3002\n2. \u5982\u679C\u60A8\u662F\u7BA1\u7406\u5458\uFF0C\u53EF\u4EE5\u70B9\u51FB\u4E0B\u65B9\u94FE\u63A5\uFF0C\u67E5\u770B\u8BE6\u7EC6\u7684\u914D\u7F6E\u6307\u5357\u5E76\u89E3\u51B3\u95EE\u9898\u3002",
-        networkError: "\u7F51\u7EDC\u9519\u8BEF"
+        networkError: "\u7F51\u7EDC\u9519\u8BEF",
+        incompatible: "\u5F53\u524D DID Spaces \u7248\u672C\u4E0D\u517C\u5BB9\u3002\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u8FDB\u884C\u8C03\u6574\u3002\n\u5982\u679C\u60A8\u662F\u7BA1\u7406\u5458\uFF0C\u53EF\u4EE5\u5355\u51FB\u4E0B\u9762\u7684\u94FE\u63A5\u8FDB\u884C\u64CD\u4F5C\u3002"
       },
       gateway: {
         add: {
@@ -51,6 +53,9 @@ const zh = flatten({
         title: "\u8BF7\u4E3A {appName} \u51FA\u793A DID Spaces NFT",
         scan: "\u4F7F\u7528\u4F60\u7684 DID Wallet \u626B\u63CF\u4E0B\u9762\u7684\u4E8C\u7EF4\u7801\u4E3A\u5E94\u7528 {appName} \u51FA\u793A DID Spaces NFT",
         success: "\u8FDE\u63A5\u6210\u529F"
+      },
+      helperText: {
+        fixCorsError: "\u4FEE\u590D\u8FDE\u63A5 DID Spaces \u65F6\u7684 CORS \u9519\u8BEF"
       }
     }
   }

package/dist/es/package.json.js

@@ -0,0 +1,3 @@
+const version = "0.5.78";
+
+export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/did-space-react",
-  "version": "0.5.76",
+  "version": "0.5.78",
   "description": "Reusable react components for did space",
   "keywords": [
     "react",
@@ -85,8 +85,8 @@
   },
   "dependencies": {
     "@arcblock/did": "^1.18.152",
-    "@arcblock/did-connect": "^2.10.75",
-    "@arcblock/ux": "^2.10.75",
+    "@arcblock/did-connect": "^2.10.76",
+    "@arcblock/ux": "^2.10.76",
     "@blocklet/js-sdk": "^1.16.34-beta-20241129-100152-679bd732",
     "@blocklet/sdk": "^1.16.34-beta-20241129-100152-679bd732",
     "@mui/icons-material": "^5.16.8",
@@ -95,6 +95,7 @@
     "@mui/system": "^5.16.8",
     "ahooks": "^3.8.1",
     "axios": "^1.7.8",
+    "compare-versions": "^6.1.1",
     "flat": "^5.0.2",
     "is-url": "^1.2.4",
     "lodash": "^4.17.21",
@@ -127,7 +128,7 @@
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
     "@vitejs/plugin-legacy": "^5.4.3",
-    "@vitest/coverage-v8": "^2.1.6",
+    "@vitest/coverage-v8": "^2.1.8",
     "babel-plugin-inline-react-svg": "^2.0.2",
     "copyfiles": "^2.4.1",
     "eslint": "^8.57.1",
@@ -137,13 +138,13 @@
     "react-dom": "^18.3.1",
     "rollup-plugin-node-builtins": "^2.1.2",
     "storybook": "^7.6.20",
-    "type-fest": "^4.29.1",
+    "type-fest": "^4.30.0",
     "typescript": "~5.5.4",
     "unbuild": "^2.0.0",
     "vite": "^5.4.11",
     "vite-plugin-babel": "^1.2.0",
     "vite-plugin-node-polyfills": "^0.22.0",
-    "vitest": "^2.1.6"
+    "vitest": "^2.1.8"
   },
-  "gitHead": "4df393e520450f2eacab119c125ba34af1629d5d"
+  "gitHead": "a78e40b323dff7d1dd378b6b2ef8fd805df4df4d"
 }